chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: queue - _unref() should return the object
[elogind.git]
/
libudev
/
libudev-queue-private.c
diff --git
a/libudev/libudev-queue-private.c
b/libudev/libudev-queue-private.c
index 9b02daf0a4968ce7e15f9e818f14304e4e5a8315..a799be062a961aa8829d97133456b5910dacc4ad 100644
(file)
--- a/
libudev/libudev-queue-private.c
+++ b/
libudev/libudev-queue-private.c
@@
-90,23
+90,24
@@
struct udev_queue_export *udev_queue_export_new(struct udev *udev)
return udev_queue_export;
}
return udev_queue_export;
}
-
void
udev_queue_export_unref(struct udev_queue_export *udev_queue_export)
+
struct udev_queue_export *
udev_queue_export_unref(struct udev_queue_export *udev_queue_export)
{
if (udev_queue_export == NULL)
{
if (udev_queue_export == NULL)
- return;
+ return
NULL
;
if (udev_queue_export->queue_file != NULL)
fclose(udev_queue_export->queue_file);
free(udev_queue_export);
if (udev_queue_export->queue_file != NULL)
fclose(udev_queue_export->queue_file);
free(udev_queue_export);
+ return NULL;
}
void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)
{
char filename[UTIL_PATH_SIZE];
}
void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)
{
char filename[UTIL_PATH_SIZE];
- util_strscpyl(filename, sizeof(filename), udev_get_
dev_path(udev_queue_export->udev), "/.run/udev
/queue.tmp", NULL);
+ util_strscpyl(filename, sizeof(filename), udev_get_
run_path(udev_queue_export->udev), "
/queue.tmp", NULL);
unlink(filename);
unlink(filename);
- util_strscpyl(filename, sizeof(filename), udev_get_
dev_path(udev_queue_export->udev), "/.run/udev
/queue.bin", NULL);
+ util_strscpyl(filename, sizeof(filename), udev_get_
run_path(udev_queue_export->udev), "
/queue.bin", NULL);
unlink(filename);
}
unlink(filename);
}
@@
-221,7
+222,7
@@
static int rebuild_queue_file(struct udev_queue_export *udev_queue_export)
}
/* create new queue file */
}
/* create new queue file */
- util_strscpyl(filename_tmp, sizeof(filename_tmp), udev_get_
dev_path(udev_queue_export->udev), "/.run/udev
/queue.tmp", NULL);
+ util_strscpyl(filename_tmp, sizeof(filename_tmp), udev_get_
run_path(udev_queue_export->udev), "
/queue.tmp", NULL);
new_queue_file = fopen(filename_tmp, "w+");
if (new_queue_file == NULL)
goto error;
new_queue_file = fopen(filename_tmp, "w+");
if (new_queue_file == NULL)
goto error;
@@
-255,7
+256,7
@@
static int rebuild_queue_file(struct udev_queue_export *udev_queue_export)
goto error;
/* rename the new file on top of the old one */
goto error;
/* rename the new file on top of the old one */
- util_strscpyl(filename, sizeof(filename), udev_get_
dev_path(udev_queue_export->udev), "/.run/udev
/queue.bin", NULL);
+ util_strscpyl(filename, sizeof(filename), udev_get_
run_path(udev_queue_export->udev), "
/queue.bin", NULL);
if (rename(filename_tmp, filename) != 0)
goto error;
if (rename(filename_tmp, filename) != 0)
goto error;
@@
-401,7
+402,7
@@
static void update_failed(struct udev_queue_export *udev_queue_export,
return;
/* location of failed file */
return;
/* location of failed file */
- util_strscpyl(filename, sizeof(filename), udev_get_
dev_path(udev), "/.run/udev
/failed/",
+ util_strscpyl(filename, sizeof(filename), udev_get_
run_path(udev), "
/failed/",
udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
switch (state) {
udev_device_get_subsystem(udev_device), ":", udev_device_get_sysname(udev_device), NULL);
switch (state) {
@@
-409,9
+410,7
@@
static void update_failed(struct udev_queue_export *udev_queue_export,
/* record event in the failed directory */
udev_queue_export->failed_count++;
util_create_path(udev, filename);
/* record event in the failed directory */
udev_queue_export->failed_count++;
util_create_path(udev, filename);
- udev_selinux_setfscreatecon(udev, filename, S_IFLNK);
symlink(udev_device_get_devpath(udev_device), filename);
symlink(udev_device_get_devpath(udev_device), filename);
- udev_selinux_resetfscreatecon(udev);
break;
case DEVICE_QUEUED:
break;
case DEVICE_QUEUED: