[PATCH] udevdb patch

This patch:

1) removes the three database files for just one udevdb.tdb file.
2) adds udevdb_init() and udevdb_exit() functions
3) initializes database now in main() in udev.c.

Please look it over.

1 files changed, 16 insertions, 5 deletions

diff --git a/udev.c b/udev.c
index 74572625af..6e7ac25175 100644
--- a/udev.c
+++ b/udev.c
@@ -31,6 +31,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
+#include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
 
@@ -91,17 +92,27 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
+	/* initialize udev database */
+	retval = udevdb_init(UDEVDB_DEFAULT);
+	if (retval != 0) {
+		dbg("Unable to initialize database.");
+		goto exit;
+	}
+
 	/* initialize the naming deamon */
 	namedev_init();
 
 	if (strcmp(action, "add") == 0)
-		return udev_add_device(device, argv[1]);
+		retval = udev_add_device(device, argv[1]);
 
-	if (strcmp(action, "remove") == 0)
-		return udev_remove_device(device, argv[1]);
+	else if (strcmp(action, "remove") == 0)
+		retval = udev_remove_device(device, argv[1]);
 
-	dbg("Unknown action: %s", action);
-	retval = -EINVAL;
+	else {
+		dbg("Unknown action: %s", action);
+		retval = -EINVAL;
+	}
+	udevdb_exit();
 
 exit:	
 	return retval;