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] man-page mention multiple symlinks
[elogind.git]
/
udevdb.c
diff --git
a/udevdb.c
b/udevdb.c
index b75bf8048f1dd3633dea0844bfa7faae5f585018..e0bd39e84bb9a15529e3f945ab61e756fa0e5e54 100644
(file)
--- a/
udevdb.c
+++ b/
udevdb.c
@@
-54,7
+54,7
@@
int udevdb_add_dev(const char *path, const struct udevice *dev)
strcpy(keystr, path);
key.dptr = keystr;
key.dsize = strlen(keystr) + 1;
strcpy(keystr, path);
key.dptr = keystr;
key.dsize = strlen(keystr) + 1;
-
+
data.dptr = (void *)dev;
data.dsize = sizeof(*dev);
data.dptr = (void *)dev;
data.dsize = sizeof(*dev);
@@
-79,7
+79,7
@@
struct udevice *udevdb_get_dev(const char *path)
dev = malloc(sizeof(*dev));
if (dev == NULL)
goto exit;
dev = malloc(sizeof(*dev));
if (dev == NULL)
goto exit;
-
+
memcpy(dev, data.dptr, sizeof(*dev));
exit:
free(data.dptr);
memcpy(dev, data.dptr, sizeof(*dev));
exit:
free(data.dptr);
@@
-99,7
+99,7
@@
int udevdb_delete_dev(const char *path)
key.dptr = keystr;
key.dsize = strlen(keystr) + 1;
key.dptr = keystr;
key.dsize = strlen(keystr) + 1;
-
+
return tdb_delete(udevdb, key);
}
return tdb_delete(udevdb, key);
}
@@
-116,20
+116,20
@@
void udevdb_exit(void)
/**
* udevdb_init: initializes database
/**
* 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;
*/
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)
if (udevdb == NULL) {
if (init_flag == UDEVDB_INTERNAL)
- dbg("
U
nable to initialize in-memory database");
+ dbg("
u
nable to initialize in-memory database");
else
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;
return -EINVAL;
}
return 0;