X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=inline;f=extras%2Fcollect%2Fcollect.c;h=7ebe865b62c7e5864c60cc4df5b2700e0a10d375;hb=f183b6ed766a18835d53dc1e36a4e98756ebd0b7;hp=9fb6737d9b4d6af94877d5b2efdb39c96ad7053e;hpb=322fc7a636296ba9a3f93912661f14c65c2af4b2;p=elogind.git

diff --git a/extras/collect/collect.c b/extras/collect/collect.c
index 9fb6737d9..7ebe865b6 100644
--- a/extras/collect/collect.c
+++ b/extras/collect/collect.c
@@ -31,9 +31,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../../list.h"
+#include "../../udev/list.h"
 
-#define TMPFILE			"/dev/.udev/collect"
+#define TMPFILE			UDEV_PREFIX "/dev/.udev/collect"
 #define BUFSIZE			16
 #define UDEV_ALARM_TIMEOUT	180
 
@@ -147,7 +147,7 @@ static int checkout(int fd)
 			if (!ptr && word < (buf + len)) {
 				bufsize = bufsize << 1;
 				if (debug)
-					fprintf(stderr, "ID overflow, restarting with size %d\n", bufsize);
+					fprintf(stderr, "ID overflow, restarting with size %zi\n", bufsize);
 				free(buf);
 				lseek(fd, 0, SEEK_SET);
 				goto restart;
@@ -321,10 +321,10 @@ static void everybody(void)
 int main(int argc, char **argv)
 {
 	static const struct option options[] = {
-		{ "add", 0, NULL, 'a' },
-		{ "remove", 0, NULL, 'r' },
-		{ "debug", 0, NULL, 'd' },
-		{ "help", 0, NULL, 'h' },
+		{ "add", no_argument, NULL, 'a' },
+		{ "remove", no_argument, NULL, 'r' },
+		{ "debug", no_argument, NULL, 'd' },
+		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
 	int argi;