chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: use startswith() and streq()
[elogind.git]
/
src
/
udev
/
udev-builtin-path_id.c
diff --git
a/src/udev/udev-builtin-path_id.c
b/src/udev/udev-builtin-path_id.c
index a8559d2dd4118ac89feb03b7db8ef364caa73a0b..09abefc032783bc65941b636b715b521a2791919 100644
(file)
--- a/
src/udev/udev-builtin-path_id.c
+++ b/
src/udev/udev-builtin-path_id.c
@@
-176,7
+176,7
@@
static struct udev_device *handle_scsi_iscsi(struct udev_device *parent, char **
transportdev = udev_device_get_parent(transportdev);
if (transportdev == NULL)
return NULL;
transportdev = udev_device_get_parent(transportdev);
if (transportdev == NULL)
return NULL;
- if (st
rncmp(udev_device_get_sysname(transportdev), "session", 7) == 0
)
+ if (st
artswith(udev_device_get_sysname(transportdev), "session")
)
break;
}
break;
}
@@
-260,7
+260,7
@@
static struct udev_device *handle_scsi_default(struct udev_device *parent, char
continue;
if (dent->d_type != DT_DIR && dent->d_type != DT_LNK)
continue;
continue;
if (dent->d_type != DT_DIR && dent->d_type != DT_LNK)
continue;
- if (
strncmp(dent->d_name, "host", 4) != 0
)
+ if (
!startswith(dent->d_name, "host")
)
continue;
i = strtoul(&dent->d_name[4], &rest, 10);
if (rest[0] != '\0')
continue;
i = strtoul(&dent->d_name[4], &rest, 10);
if (rest[0] != '\0')
@@
-349,9
+349,9
@@
static void handle_scsi_tape(struct udev_device *dev, char **path)
return;
name = udev_device_get_sysname(dev);
return;
name = udev_device_get_sysname(dev);
- if (st
rncmp(name, "nst", 3) == 0
&& strchr("lma", name[3]) != NULL)
+ if (st
artswith(name, "nst")
&& strchr("lma", name[3]) != NULL)
path_prepend(path, "nst%c", name[3]);
path_prepend(path, "nst%c", name[3]);
- else if (st
rncmp(name, "st", 2) == 0
&& strchr("lma", name[2]) != NULL)
+ else if (st
artswith(name, "st")
&& strchr("lma", name[2]) != NULL)
path_prepend(path, "st%c", name[2]);
}
path_prepend(path, "st%c", name[2]);
}