chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-util: remove superfluous const
[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 95e54520b0f6c722b0bdfcc51ceed1e0fbcf8fab..37ff1b800882a2a2d9c13a59d21c35d18bd23682 100644
(file)
--- a/
src/udev/udev-builtin-net_id.c
+++ b/
src/udev/udev-builtin-net_id.c
@@
-153,7
+153,7
@@
static bool is_pci_multifunction(struct udev_device *dev) {
const char *filename;
uint8_t config[64];
const char *filename;
uint8_t config[64];
- filename = str
append
a(udev_device_get_syspath(dev), "/config");
+ filename = str
join
a(udev_device_get_syspath(dev), "/config");
f = fopen(filename, "re");
if (!f)
return false;
f = fopen(filename, "re");
if (!f)
return false;
@@
-191,12
+191,12
@@
static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
s = names->pci_path;
l = sizeof(names->pci_path);
if (domain > 0)
s = names->pci_path;
l = sizeof(names->pci_path);
if (domain > 0)
- l = strpcpyf(&s, l, "P%
d
", domain);
- l = strpcpyf(&s, l, "p%
ds%d
", bus, slot);
+ l = strpcpyf(&s, l, "P%
u
", domain);
+ l = strpcpyf(&s, l, "p%
us%u
", bus, slot);
if (func > 0 || is_pci_multifunction(names->pcidev))
if (func > 0 || is_pci_multifunction(names->pcidev))
- l = strpcpyf(&s, l, "f%
d
", func);
+ l = strpcpyf(&s, l, "f%
u
", func);
if (dev_port > 0)
if (dev_port > 0)
- l = strpcpyf(&s, l, "d%
d
", dev_port);
+ l = strpcpyf(&s, l, "d%
u
", dev_port);
if (l == 0)
names->pci_path[0] = '\0';
if (l == 0)
names->pci_path[0] = '\0';
@@
-562,5
+562,5
@@
out:
const struct udev_builtin udev_builtin_net_id = {
.name = "net_id",
.cmd = builtin_net_id,
const struct udev_builtin udev_builtin_net_id = {
.name = "net_id",
.cmd = builtin_net_id,
- .help = "
n
etwork device properties",
+ .help = "
N
etwork device properties",
};
};