SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-device: return positive ifindex when sd_device_get_ifindex() succeeds

Browse Source 
As valid ifindex is positive value, not non-negative value.

Follow-up for dcfbde3a43.
This commit is contained in:
Yu Watanabe
2018-10-27 07:03:38 +09:00
parent 9bf7dba739
commit 1dfa960786
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/device-enumerator.c
+1 -1
View File
@@ -497,7 +497,7 @@ static int enumerator_scan_dir_and_add_devices(sd_device_enumerator *enumerator,
if (!enumerator->match_allow_uninitialized &&
!initialized &&
(sd_device_get_devnum(device, &devnum) >= 0 ||
(sd_device_get_ifindex(device, &ifindex) >= 0 && ifindex > 0)))
sd_device_get_ifindex(device, &ifindex) >= 0))
continue;
if (!match_parent(enumerator, device))
src/libsystemd/sd-device/sd-device.c
+3 -4
View File
@@ -38,7 +38,6 @@ int device_new_aux(sd_device **ret) {
*device = (sd_device) {
.n_ref = 1,
.watch_handle = -1,
.ifindex = -1,
.devmode = (mode_t) -1,
.devuid = (uid_t) -1,
.devgid = (gid_t) -1,
@@ -579,7 +578,7 @@ _public_ int sd_device_get_ifindex(sd_device *device, int *ifindex) {
if (r < 0)
return r;
if (device->ifindex < 0)
if (device->ifindex <= 0)
return -ENOENT;
*ifindex = device->ifindex;
@@ -1241,9 +1240,9 @@ int device_get_id_filename(sd_device *device, const char **ret) {
major(devnum), minor(devnum));
if (r < 0)
return -ENOMEM;
} else if (sd_device_get_ifindex(device, &ifindex) >= 0 && ifindex > 0) {
} else if (sd_device_get_ifindex(device, &ifindex) >= 0) {
/* use netdev ifindex — n3 */
r = asprintf(&id, "n%u", ifindex);
r = asprintf(&id, "n%u", (unsigned) ifindex);
if (r < 0)
return -ENOMEM;
} else {