X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevd.c;h=e1ae7eac5459ecaea2fe8cbd5b9f119431557275;hp=59866afdeef8ebf772796c914bbd428b0ee46444;hb=fb762bb928772f1923fef1e342d8ebca9bf7691f;hpb=31c1f537450e96f8ddd6a0fad2adaefe57996f03

diff --git a/udev/udevd.c b/udev/udevd.c
index 59866afde..e1ae7eac5 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stddef.h>
 #include <signal.h>
 #include <unistd.h>
@@ -168,8 +166,8 @@ enum event_state {
 
 static void export_event_state(struct udevd_uevent_msg *msg, enum event_state state)
 {
-	char filename[PATH_SIZE];
-	char filename_failed[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
+	char filename_failed[UTIL_PATH_SIZE];
 	size_t start;
 
 	/* location of queue file */
@@ -194,7 +192,7 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st
 	case EVENT_FINISHED:
 		if (msg->devpath_old != NULL) {
 			/* "move" event - rename failed file to current name, do not delete failed */
-			char filename_failed_old[PATH_SIZE];
+			char filename_failed_old[UTIL_PATH_SIZE];
 
 			util_strlcpy(filename_failed_old, udev_get_dev_path(msg->udev), sizeof(filename_failed_old));
 			util_strlcat(filename_failed_old, "/", sizeof(filename_failed_old));
@@ -279,7 +277,7 @@ static void udev_event_run(struct udevd_uevent_msg *msg)
 
 static void msg_queue_insert(struct udevd_uevent_msg *msg)
 {
-	char filename[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
 	int fd;
 
 	msg->queue_time = time(NULL);
@@ -346,7 +344,7 @@ static int compare_devpath(const char *running, const char *waiting)
 {
 	int i;
 
-	for (i = 0; i < PATH_SIZE; i++) {
+	for (i = 0; i < UTIL_PATH_SIZE; i++) {
 		/* identical device event found */
 		if (running[i] == '\0' && waiting[i] == '\0')
 			return 1;
@@ -750,7 +748,7 @@ static int init_uevent_netlink_sock(struct udev *udev)
 
 static void export_initial_seqnum(struct udev *udev)
 {
-	char filename[PATH_SIZE];
+	char filename[UTIL_PATH_SIZE];
 	int fd;
 	char seqnum[32];
 	ssize_t len = 0;