chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udevd-test.pl: remove wrong date calculation
[elogind.git]
/
udev_add.c
diff --git
a/udev_add.c
b/udev_add.c
index 60506b424307506e6402b2ef0ec99ab6e9fbe77f..f537f567ccdfb36c034af288cc26841f9191d9d7 100644
(file)
--- a/
udev_add.c
+++ b/
udev_add.c
@@
-38,11
+38,11
@@
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
-#include "udev_
lib
.h"
+#include "udev_
utils
.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
-#include "udevdb.h"
+#include "udev
_
db.h"
#include "selinux.h"
#include "selinux.h"
@@
-129,7
+129,7
@@
static int create_node(struct udevice *udev)
char *pos;
int len;
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) {
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);
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);
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 (retval != 0)
goto exit;
- if (udev
db_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 */
"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') {
udev->devname[NAME_SIZE-1] = '\0';
} else if (udev->type == 'n') {