X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils.c;h=003d7bded93cec5f68838514619ea9fd43897ae2;hp=683378aadf25efffa9a93b5cc3794b8641423ec4;hb=7ba2d2e6ae70964b68056283fcea209cb4b617ec;hpb=2a4ce7092546039063fcf5aaa36760a89d8c9047

diff --git a/udev_utils.c b/udev_utils.c
index 683378aad..003d7bded 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -30,11 +30,7 @@
 #include <syslog.h>
 #include <sys/utsname.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"
 
 
 int log_priority(const char *priority)
@@ -57,7 +53,7 @@ int log_priority(const char *priority)
 	return 0;
 }
 
-int name_list_add(struct list_head *name_list, const char *name, int sort)
+char *name_list_add(struct list_head *name_list, const char *name, int sort)
 {
 	struct name_entry *loop_name;
 	struct name_entry *new_name;
@@ -66,7 +62,7 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
 		/* avoid doubles */
 		if (strcmp(loop_name->name, name) == 0) {
 			dbg("'%s' is already in the list", name);
-			return 0;
+			return loop_name->name;
 		}
 	}
 
@@ -77,19 +73,17 @@ int name_list_add(struct list_head *name_list, const char *name, int sort)
 		}
 
 	new_name = malloc(sizeof(struct name_entry));
-	if (new_name == NULL) {
-		dbg("error malloc");
-		return -ENOMEM;
-	}
+	if (new_name == NULL)
+		return NULL;
 
 	strlcpy(new_name->name, name, sizeof(new_name->name));
 	dbg("adding '%s'", new_name->name);
 	list_add_tail(&new_name->node, &loop_name->node);
 
-	return 0;
+	return new_name->name;
 }
 
-int name_list_key_add(struct list_head *name_list, const char *key, const char *value)
+char *name_list_key_add(struct list_head *name_list, const char *key, const char *value)
 {
 	struct name_entry *loop_name;
 	struct name_entry *new_name;
@@ -99,22 +93,20 @@ int name_list_key_add(struct list_head *name_list, const char *key, const char *
 			dbg("key already present '%s', replace it", loop_name->name);
 			snprintf(loop_name->name, sizeof(loop_name->name), "%s=%s", key, value);
 			loop_name->name[sizeof(loop_name->name)-1] = '\0';
-			return 0;
+			return loop_name->name;
 		}
 	}
 
 	new_name = malloc(sizeof(struct name_entry));
-	if (new_name == NULL) {
-		dbg("error malloc");
-		return -ENOMEM;
-	}
+	if (new_name == NULL)
+		return NULL;
 
 	snprintf(new_name->name, sizeof(new_name->name), "%s=%s", key, value);
 	new_name->name[sizeof(new_name->name)-1] = '\0';
 	dbg("adding '%s'", new_name->name);
 	list_add_tail(&new_name->node, &loop_name->node);
 
-	return 0;
+	return new_name->name;
 }
 
 void name_list_cleanup(struct list_head *name_list)
@@ -139,7 +131,7 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
 	dbg("open directory '%s'", dirname);
 	dir = opendir(dirname);
 	if (dir == NULL) {
-		dbg("unable to open '%s'", dirname);
+		err("unable to open '%s': %s", dirname, strerror(errno));
 		return -1;
 	}