X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Ftest-libudev.c;h=481ce65dbf57b4e1b4d164695d5795f125340cc9;hb=d5891fdacf761130c9babdb5e50367504d29970c;hp=6161fb3e3110512ba7dcc3f53fe8de15bbb18bd2;hpb=0b87a07761dcad31583142a3a454c42833e65a09;p=elogind.git diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c index 6161fb3e3..481ce65db 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -21,6 +21,7 @@ #include #include "libudev.h" +#include "util.h" #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) @@ -434,7 +435,6 @@ int main(int argc, char *argv[]) const char *syspath = "/devices/virtual/mem/null"; const char *subsystem = NULL; char path[1024]; - const char *str; udev = udev_new(); printf("context: %p\n", udev); @@ -474,14 +474,9 @@ int main(int argc, char *argv[]) } } - str = udev_get_sys_path(udev); - printf("sys_path: '%s'\n", str); - str = udev_get_dev_path(udev); - printf("dev_path: '%s'\n", str); - /* add sys path if needed */ - if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) { - snprintf(path, sizeof(path), "%s%s", udev_get_sys_path(udev), syspath); + if (!startswith(syspath, "/sys")) { + snprintf(path, sizeof(path), "/sys/%s", syspath); syspath = path; }