Merge git://github.com/rfc1036/whoisHEADmaster

1 files changed, 4 insertions, 3 deletions

diff --git a/utils.c b/utils.c
index 254bf2a..4ade650 100644
--- a/utils.c
+++ b/utils.c
@@ -46,7 +46,8 @@ char **merge_args(char *args, char *argv[], int *argc)
 {
     char *arg, *argstring;
     char **newargs = NULL;
-    unsigned int i, num_env = 0;
+    int i;
+    unsigned int num_env = 0;
 
     if (!args)
 	return argv;
@@ -72,7 +73,7 @@ char **merge_args(char *args, char *argv[], int *argc)
 }
 
 /* Error routines */
-void err_sys(const char *fmt, ...)
+void NORETURN err_sys(const char *fmt, ...)
 {
     va_list ap;
 
@@ -83,7 +84,7 @@ void err_sys(const char *fmt, ...)
     exit(2);
 }
 
-void err_quit(const char *fmt, ...)
+void NORETURN err_quit(const char *fmt, ...)
 {
     va_list ap;