X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_add.c;h=4fb5ef18c06149200406753edfc0eb08acbd7a40;hp=60506b424307506e6402b2ef0ec99ab6e9fbe77f;hb=a4f0cc793a9a2053f9733c5ebd1445c9a2678445;hpb=2b41e68a08548ce44b4d145900dab2bb04cd34f7

diff --git a/udev_add.c b/udev_add.c
index 60506b424..4fb5ef18c 100644
--- a/udev_add.c
+++ b/udev_add.c
@@ -42,7 +42,7 @@
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
+#include "udev_db.h"
 
 #include "selinux.h"
 
@@ -129,7 +129,7 @@ static int create_node(struct udevice *udev)
 	char *pos;
 	int len;
 
-	snprintf(filename, NAME_SIZE-1, "%s/%s", udev_root, udev->name);
+	snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
 	filename[NAME_SIZE-1] = '\0';
 
 	switch (udev->type) {
@@ -210,7 +210,7 @@ static int create_node(struct udevice *udev)
 		char linktarget[NAME_SIZE];
 
 		strfieldcpymax(linkname, pos, len+1);
-		snprintf(filename, NAME_SIZE-1, "%s/%s", udev_root, linkname);
+		snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
 		filename[NAME_SIZE-1] = '\0';
 
 		dbg("symlink '%s' to node '%s' requested", filename, udev->name);
@@ -303,12 +303,12 @@ int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 		if (retval != 0)
 			goto exit;
 
-		if (udevdb_add_dev(udev) != 0)
-			dbg("udevdb_add_dev failed, but we create the node anyway, "
+		if (udev_db_add_device(udev) != 0)
+			dbg("udev_db_add_dev failed, but we create the node anyway, "
 			    "remove might not work for custom names");
 
 		/* use full path to the environment */
-		snprintf(udev->devname, NAME_SIZE-1, "%s/%s", udev_root, udev->name);
+		snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
 		udev->devname[NAME_SIZE-1] = '\0';
 
 	} else if (udev->type == 'n') {