chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a few signed/unsigned format string issues
[elogind.git]
/
src
/
udev
/
udev-builtin-net_id.c
diff --git
a/src/udev/udev-builtin-net_id.c
b/src/udev/udev-builtin-net_id.c
index 9ae8f08ccfea19fa721bddc8ca552e61268bf489..b91ca9df5b4e748da45f9237bce8f3e3a8a25503 100644
(file)
--- a/
src/udev/udev-builtin-net_id.c
+++ b/
src/udev/udev-builtin-net_id.c
@@
-159,30
+159,24
@@
static bool is_pci_multifunction(struct udev_device *dev) {
if ((config[PCI_HEADER_TYPE] & 0x80) != 0)
multi = true;
out:
if ((config[PCI_HEADER_TYPE] & 0x80) != 0)
multi = true;
out:
- if(f)
+ if
(f)
fclose(f);
return multi;
}
static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
struct udev *udev = udev_device_get_udev(names->pcidev);
fclose(f);
return multi;
}
static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
struct udev *udev = udev_device_get_udev(names->pcidev);
- unsigned int domain;
- unsigned int bus;
- unsigned int slot;
- unsigned int func;
- unsigned int dev_id = 0;
+ unsigned domain, bus, slot, func, dev_id = 0;
size_t l;
char *s;
const char *attr;
struct udev_device *pci = NULL;
size_t l;
char *s;
const char *attr;
struct udev_device *pci = NULL;
- char slots[256];
-
DIR *dir
;
+ char slots[256]
, str[256]
;
+
_cleanup_closedir_ DIR *dir = NULL
;
struct dirent *dent;
struct dirent *dent;
- char str[256];
- int hotplug_slot = 0;
- int err = 0;
+ int hotplug_slot = 0, err = 0;
- if (sscanf(udev_device_get_sysname(names->pcidev), "%x:%x:%x.%
d
", &domain, &bus, &slot, &func) != 4)
+ if (sscanf(udev_device_get_sysname(names->pcidev), "%x:%x:%x.%
u
", &domain, &bus, &slot, &func) != 4)
return -ENOENT;
/* kernel provided multi-device index */
return -ENOENT;
/* kernel provided multi-device index */
@@
-239,7
+233,6
@@
static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
if (hotplug_slot > 0)
break;
}
if (hotplug_slot > 0)
break;
}
- closedir(dir);
if (hotplug_slot > 0) {
s = names->pci_slot;
if (hotplug_slot > 0) {
s = names->pci_slot;
@@
-341,11
+334,11
@@
static int names_bcma(struct udev_device *dev, struct netnames *names) {
return -ENOENT;
/* bus num:core num */
return -ENOENT;
/* bus num:core num */
- if (sscanf(udev_device_get_sysname(bcmadev), "bcma%*
d:%d
", &core) != 1)
+ if (sscanf(udev_device_get_sysname(bcmadev), "bcma%*
u:%u
", &core) != 1)
return -EINVAL;
/* suppress the common core == 0 */
if (core > 0)
return -EINVAL;
/* suppress the common core == 0 */
if (core > 0)
- snprintf(names->bcma_core, sizeof(names->bcma_core), "b%
d
", core);
+ snprintf(names->bcma_core, sizeof(names->bcma_core), "b%
u
", core);
names->type = NET_BCMA;
return 0;
names->type = NET_BCMA;
return 0;