X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=d3c74dd46a4e9f5b9248759b2a711888585e2222;hp=6af9df77040a386c39a93ddf1245235efd517eda;hb=e047ca9bdfc3d95cccbbcf6d4f2358648c7d0758;hpb=95a6f4c8acafe7031087667aa556a50a6a091c93

diff --git a/udevsend.c b/udevsend.c
index 6af9df770..d3c74dd46 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -23,17 +23,15 @@
  */
 
 #include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <wait.h>
-#include <sys/socket.h>
-#include <sys/un.h>
 
 #include "udev.h"
 #include "udev_version.h"
@@ -127,7 +125,9 @@ int main(int argc, char* argv[])
 	int sock;
 	struct sockaddr_un saddr;
 
+#ifdef DEBUG
 	init_logging("udevsend");
+#endif
 
 	subsystem = argv[1];
 	if (subsystem == NULL) {
@@ -165,7 +165,7 @@ int main(int argc, char* argv[])
 	strcpy(saddr.sun_path, UDEVD_SOCK);
 
 	/* try to connect, if it fails start daemon */
-	retval = connect(sock, &saddr, sizeof(saddr));
+	retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
 	if (retval != -1) {
 		goto send;
 	} else {
@@ -184,7 +184,7 @@ int main(int argc, char* argv[])
 	tspec.tv_nsec = 100000000;  /* 100 millisec */
 	loop = UDEVSEND_CONNECT_RETRY;
 	while (loop--) {
-		retval = connect(sock, &saddr, sizeof(saddr));
+		retval = connect(sock, (struct sockaddr *) &saddr, sizeof(saddr));
 		if (retval != -1)
 			goto send;
 		else