[distcc] 3 minor tweaks

[Wayne Davison]

I'd suggest the following three minor tweaks:

- Removed prototype for dcc_trace_argv() (since it's a define now).

- Use "else while(0)" instead of "else {}" so that using the
  dcc_trace_argv() define doesn't result in two C statements.

- Return the "ret" value in dcc_r_request_header() when it's non-0.

..wayne..
-------------- next part --------------
Index: src/distcc.h
--- src/distcc.h	2 Apr 2003 06:37:36 -0000	1.93
+++ src/distcc.h	2 Apr 2003 10:34:03 -0000
@@ -75,7 +75,6 @@
 int dcc_scan_args(char *argv[], /*@out@*/ /*@relnull@*/ char **orig_o,
                   char **orig_i, char ***ret_newargv);
 char *dcc_argv_tostr(char **a);
-int dcc_trace_argv(const char *message, char *argv[]);
 
 int dcc_argv_len(char **a);
 
@@ -87,7 +86,7 @@
         _astr = dcc_argv_tostr(_argv);          \
         rs_trace("%s: %s", _message, _astr);    \
         free(_astr);                            \
-    } else {} 
+    } else while (0)
 
 
 /* dopt.c */
Index: src/serve.c
--- src/serve.c	2 Apr 2003 04:57:18 -0000	1.84
+++ src/serve.c	2 Apr 2003 10:34:03 -0000
@@ -91,7 +91,7 @@
     
     if ((ret = dcc_r_token_int(ifd, "DIST", &vers)) != 0) {
         rs_log_error("client did not provide distcc magic fairy dust");
-        return EXIT_PROTOCOL_ERROR;
+        return ret;
     }
 
     if (vers != PROTO_VER) {