X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevdb.c;h=bbbeddad477958a6cb9827879d82cf1675ae28b5;hb=2441c20743e62f135d1b52cb3fa47b29d59fbef6;hp=b75bf8048f1dd3633dea0844bfa7faae5f585018;hpb=5840bc63e2029d22682d8de77dc8fcc4da1b436c;p=elogind.git

diff --git a/udevdb.c b/udevdb.c
index b75bf8048..bbbeddad4 100644
--- a/udevdb.c
+++ b/udevdb.c
@@ -24,6 +24,7 @@
 /*
  * udev database library
  */
+#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -54,36 +55,29 @@ int udevdb_add_dev(const char *path, const struct udevice *dev)
 	strcpy(keystr, path);
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
-	
+
 	data.dptr = (void *)dev;
 	data.dsize = sizeof(*dev);
 	
 	return tdb_store(udevdb, key, data, TDB_REPLACE); 
 }
 
-struct udevice *udevdb_get_dev(const char *path)
+int udevdb_get_dev(const char *path, struct udevice *dev)
 {
 	TDB_DATA key, data;
-	struct udevice *dev;
 
 	if (path == NULL)
-		return NULL;
+		return -ENODEV;
 
 	key.dptr = (void *)path;
 	key.dsize = strlen(path) + 1;
 
 	data = tdb_fetch(udevdb, key);
 	if (data.dptr == NULL || data.dsize == 0)
-		return NULL;
+		return -ENODEV;
 
-	dev = malloc(sizeof(*dev));
-	if (dev == NULL)
-		goto exit;
-	
 	memcpy(dev, data.dptr, sizeof(*dev));
-exit:
-	free(data.dptr);
-	return dev;
+	return 0;
 }
 
 int udevdb_delete_dev(const char *path)
@@ -99,7 +93,7 @@ int udevdb_delete_dev(const char *path)
 
 	key.dptr = keystr;
 	key.dsize = strlen(keystr) + 1;
-	
+
 	return tdb_delete(udevdb, key);
 }
 
@@ -116,20 +110,20 @@ void udevdb_exit(void)
 
 /**
  * udevdb_init: initializes database
- * @init_flag: database can either be in memory - UDEVDB_INTERNAL - or
- *	written to a file with UDEVDB_DEFAULT.
+ * @init_flag: UDEVDB_INTERNAL - database stays in memory
+ *	       UDEVDB_DEFAULT - database is written to a file
  */
 int udevdb_init(int init_flag)
 {
 	if (init_flag != UDEVDB_DEFAULT && init_flag != UDEVDB_INTERNAL)
 		return -EINVAL;
 
-	udevdb = tdb_open(UDEV_CONFIG_DIR UDEV_DB, 0, init_flag, O_RDWR | O_CREAT, 0644);
+	udevdb = tdb_open(udev_db_filename, 0, init_flag, O_RDWR | O_CREAT, 0644);
 	if (udevdb == NULL) {
 		if (init_flag == UDEVDB_INTERNAL)
-			dbg("Unable to initialize in-memory database");
+			dbg("unable to initialize in-memory database");
 		else
-			dbg("Unable to initialize database at %s", UDEV_CONFIG_DIR UDEV_DB);
+			dbg("unable to initialize database at '%s'", udev_db_filename);
 		return -EINVAL;
 	}
 	return 0;