ubik-warnings-cleanup-20010605

more warning cleanup

diff --git a/src/ubik/beacon.c b/src/ubik/beacon.c
index fe8ac9ec34ed765ed14cd3b4ecebbf5aab5f8843..c43ab330dab40c76c3569716539ee085e1b29507 100644 (file)
--- a/src/ubik/beacon.c
+++ b/src/ubik/beacon.c
@@ -438,9 +438,9 @@ ubeacon_Interact() {
 * Return Values : 0 on success, non-zero on failure
 */
 static verifyInterfaceAddress(ame, info, aservers)
+    afs_uint32 *ame;           /* one of my interface addr in net byte order */
     struct afsconf_cell *info;
     afs_uint32 aservers[];     /* list of all possible server addresses */
-    afs_uint32 *ame;           /* one of my interface addr in net byte order */
 {
     afs_uint32 myAddr[UBIK_MAX_INTERFACE_ADDR], *servList, tmpAddr;
     int        count, index, found, i, j, totalServers, start, end;

diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c
index 7145036b82cba3f030ece0c36f338803909525de..d8a2c1bc830b00acdbe1e3ee6249eea3a7e84e02 100644 (file)
--- a/src/ubik/udebug.c
+++ b/src/ubik/udebug.c
@@ -8,8 +8,15 @@
  */
 
 #include <afs/param.h>
+#include <afsconfig.h>
 #include <sys/types.h>
 #include <stdlib.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else
@@ -18,6 +25,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
+#ifdev HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <signal.h>
 #include <time.h>
 
@@ -38,7 +48,7 @@ register char *aport; {
     register afs_int32 total;
 
     total = 0;
-    while (tc = *aport++) {
+    while ((tc = *aport++)) {
        if (tc < '0' || tc > '9') return -1;    /* bad port number */
        total *= 10;
        total += tc - (int) '0';
@@ -294,10 +304,12 @@ struct cmd_syndesc *as; {
                   usdebug.currentDB, usdebug.up, usdebug.beaconSinceDown);
        }
     }
+    return (0);
 }
 
 #include "AFS_component_version_number.c"
 
+int
 main(argc, argv)
     int argc;
     char **argv; {