iodine/iodined: do not print usage if no superuser

There is no value in printing the usage in this case, as the usage
doesn't give the user any hint on how to solve this issue.

Furthermore, replace the Windows implementation with an empty inline
function, which will result in no code.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>

src/common.c

@@ -101,18 +101,16 @@ int setgroups(int count, int *groups)
 }
 #endif
 
-
-void
-check_superuser(void (*usage_fn)(void))
-{
 #ifndef WINDOWS32
+void
+check_superuser(void)
+{
 	if (geteuid() != 0) {
 		warnx("Run as root and you'll be happy.\n");
-		usage_fn();
-		/* NOTREACHED */
+		exit(-1);
+	}
 }
 #endif
-}
 
 char *
 format_addr(struct sockaddr_storage *sockaddr, int sockaddr_len)

src/common.h

@@ -102,7 +102,13 @@ enum connection {
 	CONN_MAX
 };
 
-void check_superuser(void (*usage_fn)(void));
+#ifdef WINDOWS32
+static inline void check_superuser(void)
+{
+}
+#else
+void check_superuser(void);
+#endif
 char *format_addr(struct sockaddr_storage *sockaddr, int sockaddr_len);
 int get_addr(char *, int, int, int, struct sockaddr_storage *);
 int open_dns(struct sockaddr_storage *, size_t);

src/iodine.c

@@ -275,7 +275,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	check_superuser(usage);
+	check_superuser();
 
 	argc -= optind;
 	argv += optind;

src/iodined.c

@@ -2537,7 +2537,7 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	check_superuser(usage);
+	check_superuser();
 
 	if (argc != 2)
 		usage();