X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-queue.c;h=be6409d02a4d82e462f0400d2f5d30aead2fa9d7;hp=be8804bdd004851fb3ed8d77bbffca64a03447be;hb=2906cbbae4d97291c1cfc456cf132726fffd8fc0;hpb=88cbfb09ee5510277503ff1830ecc3aa6c380b00

diff --git a/libudev/libudev-queue.c b/libudev/libudev-queue.c
index be8804bdd..be6409d02 100644
--- a/libudev/libudev-queue.c
+++ b/libudev/libudev-queue.c
@@ -28,9 +28,9 @@
  * SECTION:libudev-queue
  * @short_description: access to currently active events
  *
- * The udev daemon processes event asynchronously. All events which do not have
- * interdependencies are run in parallel. This exports the current state of the
- * event processing queue, and the currently event sequence numbers from the kernel
+ * The udev daemon processes events asynchronously. All events which do not have
+ * interdependencies run in parallel. This exports the current state of the
+ * event processing queue, and the current event sequence numbers from the kernel
  * and the udev daemon.
  */
 
@@ -214,7 +214,7 @@ static FILE *open_queue_file(struct udev_queue *udev_queue, unsigned long long i
 	char filename[UTIL_PATH_SIZE];
 	FILE *queue_file;
 
-	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue->udev), "/.udev/queue.bin", NULL);
+	util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue->udev), "/queue.bin", NULL);
 	queue_file = fopen(filename, "re");
 	if (queue_file == NULL)
 		return NULL;
@@ -343,7 +343,7 @@ out:
  * @start: first event sequence number
  * @end: last event sequence number
  *
- * Returns: if any of the sequence numbers in the given range is currently active.
+ * Returns: a flag indicating if any of the sequence numbers in the given range is currently active.
  **/
 int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue,
 					       unsigned long long int start, unsigned long long int end)
@@ -405,7 +405,7 @@ int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue,
  * @udev_queue: udev queue context
  * @seqnum: sequence number
  *
- * Returns: a flag indicating if the given sequence number is handled.
+ * Returns: a flag indicating if the given sequence number is currently active.
  **/
 int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned long long int seqnum)
 {
@@ -454,7 +454,7 @@ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev
 			break;
 
 		if (len > 0) {
-			udev_list_entry_add(udev_queue->udev, &udev_queue->queue_list, syspath, seqnum_str, 0, 0);
+			udev_list_entry_add(udev_queue->udev, &udev_queue->queue_list, syspath, seqnum_str, 0);
 		} else {
 			udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_queue->queue_list)) {
 				if (strcmp(seqnum_str, udev_list_entry_get_value(list_entry)) == 0) {
@@ -484,7 +484,7 @@ struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev
 	if (udev_queue == NULL)
 		return NULL;
 	udev_list_cleanup_entries(udev_queue->udev, &udev_queue->failed_list);
-	util_strscpyl(path, sizeof(path), udev_get_dev_path(udev_queue->udev), "/.udev/failed", NULL);
+	util_strscpyl(path, sizeof(path), udev_get_run_path(udev_queue->udev), "/failed", NULL);
 	dir = opendir(path);
 	if (dir == NULL)
 		return NULL;
@@ -508,7 +508,7 @@ struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev
 		util_strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL);
 		if (stat(filename, &statbuf) != 0)
 			continue;
-		udev_list_entry_add(udev_queue->udev, &udev_queue->failed_list, syspath, NULL, 0, 0);
+		udev_list_entry_add(udev_queue->udev, &udev_queue->failed_list, syspath, NULL, 0);
 	}
 	closedir(dir);
 	return udev_list_get_entry(&udev_queue->failed_list);