summaryrefslogtreecommitdiff
path: root/payloads/libpayload/libpci
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2011-04-21 18:57:16 +0200
committerUwe Hermann <uwe@hermann-uwe.de>2011-06-30 20:41:23 +0200
commit7f96583f0f6b9829f73fb8afbb6f367323446030 (patch)
tree4c26b124a3c077cf1419f143bf29e89ea2d528e2 /payloads/libpayload/libpci
parentb3db79e9965cb290615a02b324648bc64f805660 (diff)
downloadcoreboot-7f96583f0f6b9829f73fb8afbb6f367323446030.tar.xz
Reduce warnings/errors in libpayload when using picky compiler options
The new build system uses quite a few more -W flags for the compiler by default than the old one. And that's for the better. Change-Id: Ia8e3d28fb35c56760c2bd0983046c7067e8c5dd6 Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/72 Tested-by: build bot (Jenkins) Reviewed-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'payloads/libpayload/libpci')
-rw-r--r--payloads/libpayload/libpci/libpci.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/payloads/libpayload/libpci/libpci.c b/payloads/libpayload/libpci/libpci.c
index 0b54ba338c..203e770e47 100644
--- a/payloads/libpayload/libpci/libpci.c
+++ b/payloads/libpayload/libpci/libpci.c
@@ -96,6 +96,8 @@ void pci_filter_init(struct pci_access* pacc, struct pci_filter* pf)
pf->device = -1;
}
+static char *invalid_pci_device_string = (char *)"invalid pci device string";
+
/* parse domain:bus:dev.func (with all components but "dev" optional)
* into filter.
* Returns NULL on success, a string pointer to the error message otherwise.
@@ -109,7 +111,7 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id)
char *funcp = strrchr(id, '.');
if (funcp) {
filter->func = strtoul(funcp+1, &endptr, 0);
- if (endptr[0] != '\0') return "invalid pci device string";
+ if (endptr[0] != '\0') return invalid_pci_device_string;
}
char *devp = strrchr(id, ':');
@@ -118,7 +120,7 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id)
} else {
filter->dev = strtoul(devp+1, &endptr, 0);
}
- if (endptr != funcp) return "invalid pci device string";
+ if (endptr != funcp) return invalid_pci_device_string;
if (!devp) return NULL;
char *busp = strchr(id, ':');
@@ -127,11 +129,11 @@ char *pci_filter_parse_slot(struct pci_filter* filter, const char* id)
} else {
filter->bus = strtoul(busp+1, &endptr, 0);
}
- if (endptr != funcp) return "invalid pci device string";
+ if (endptr != funcp) return invalid_pci_device_string;
if (busp == devp) return NULL;
filter->domain = strtoul(id, &endptr, 0);
- if (endptr != busp) return "invalid pci device string";
+ if (endptr != busp) return invalid_pci_device_string;
return NULL;
}