From 82d03cb6cc04d9830eafa0fc1887e777dc6a64cb Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@mit.edu>
Date: Thu, 12 Aug 1999 20:19:28 +0000
Subject: fix things Irix n32 cc complains about

---
 clients/xzwrite/destlist.c      |  2 +-
 clients/zctl/zctl.c             | 22 +++++++++++++++++++++-
 clients/zleave/zleave.c         |  8 ++++++++
 clients/zpopnotify/zpopnotify.c |  3 +++
 clients/zwrite/zwrite.c         |  3 +++
 lib/ZParseNot.c                 |  2 +-
 server/realm.c                  |  6 ++++--
 zhm/zhm_server.c                |  9 +++++++++
 zwgc/exec.c                     |  4 ++--
 zwgc/tty_filter.c               |  8 ++++----
 zwgc/xerror.c                   |  1 +
 zwgc/xshow.c                    |  1 +
 zwgc/zephyr.c                   |  2 +-
 13 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/clients/xzwrite/destlist.c b/clients/xzwrite/destlist.c
index 21b9b89..8621922 100644
--- a/clients/xzwrite/destlist.c
+++ b/clients/xzwrite/destlist.c
@@ -23,7 +23,7 @@ static DynObject	dests;
 extern Defaults		defs;
 
 static void get_dest_from_file(), _get_default_dest();
-static int sort_dest_func();
+static int sort_dest_func(const void *, const void *);
 
 /* A function for debugging */
 void dest_print()
diff --git a/clients/zctl/zctl.c b/clients/zctl/zctl.c
index e68065a..b7154ec 100644
--- a/clients/zctl/zctl.c
+++ b/clients/zctl/zctl.c
@@ -48,6 +48,8 @@ char ourhost[MAXHOSTNAMELEN],ourhostcanon[MAXHOSTNAMELEN];
 
 extern ss_request_table zctl_cmds;
 
+void add_file(), del_file(), fix_macros(), fix_macros2();
+
 main(argc,argv)
 	int argc;
 	char *argv[];
@@ -143,6 +145,7 @@ main(argc,argv)
 	exit(0);
 }
 
+void
 set_file(argc,argv)
 	int argc;
 	char *argv[];
@@ -158,6 +161,7 @@ set_file(argc,argv)
 		(void) strcpy(subsname,argv[1]);
 }
 
+void
 flush_locations(argc,argv)
 	int argc;
 	char *argv[];
@@ -173,6 +177,7 @@ flush_locations(argc,argv)
 		ss_perror(sci_idx,retval,"while flushing locations");
 }
 
+void
 wgc_control(argc,argv)
 	int argc;
 	register char **argv;
@@ -233,6 +238,7 @@ wgc_control(argc,argv)
 			  "while reinitializing");
 } 
 
+void
 hm_control(argc,argv)
 	int argc;
 	char *argv[];
@@ -269,6 +275,7 @@ hm_control(argc,argv)
 		ss_perror(sci_idx,retval,"while sending notice");
 } 
 
+void
 show_var(argc,argv)
 	int argc;
 	char *argv[];
@@ -290,6 +297,7 @@ show_var(argc,argv)
 	}
 }
 
+void
 set_var(argc,argv)
 	int argc;
 	register char **argv;
@@ -369,6 +377,7 @@ set_var(argc,argv)
 	} 
 }
 
+void
 do_hide(argc,argv)
 	int argc;
 	char *argv[];
@@ -389,6 +398,7 @@ do_hide(argc,argv)
 	return;
 }
 
+void
 unset_var(argc,argv)
 	int argc;
 	char *argv[];
@@ -406,7 +416,8 @@ unset_var(argc,argv)
 			ss_perror(sci_idx,retval,
 				  "while unsetting variable value");
 }
-	
+
+void
 cancel_subs(argc,argv)
 	int argc;
 	char *argv[];
@@ -427,6 +438,7 @@ cancel_subs(argc,argv)
 		ss_perror(sci_idx,retval,"while cancelling subscriptions");
 }
 
+void
 subscribe(argc,argv)
 	int argc;
 	char *argv[];
@@ -458,6 +470,7 @@ subscribe(argc,argv)
 		ss_perror(sci_idx,retval,"while subscribing");
 } 
 
+void
 sub_file(argc,argv)
 	int argc;
 	char *argv[];
@@ -508,6 +521,7 @@ sub_file(argc,argv)
 	return;
 }
 
+void
 add_file(wgport,subs,unsub)
 short wgport;
 ZSubscription_t *subs;
@@ -541,6 +555,7 @@ int unsub;
 	return;
 }
 
+void
 del_file(wgport,subs,unsub)
 short wgport;
 register ZSubscription_t *subs;
@@ -648,6 +663,7 @@ int which;
 	return(delflag);
 }
 
+void
 load_subs(argc,argv)
 	int argc;
 	char *argv[];
@@ -825,6 +841,7 @@ cleanup:
 	return;
 }
 
+void
 current(argc,argv)
 	int argc;
 	char *argv[];
@@ -921,6 +938,7 @@ current(argc,argv)
 	}
 }
 
+int
 make_exist(filename)
 	char *filename;
 {
@@ -944,6 +962,7 @@ make_exist(filename)
 	return (0);
 }
 
+void
 fix_macros(subs,subs2,num)
 	ZSubscription_t *subs,*subs2;
 	int num;
@@ -958,6 +977,7 @@ fix_macros(subs,subs2,num)
 	}
 }
 
+void
 fix_macros2(src,dest)
 	register char *src;
 	char **dest;
diff --git a/clients/zleave/zleave.c b/clients/zleave/zleave.c
index ee2d8dd..91e8c14 100644
--- a/clients/zleave/zleave.c
+++ b/clients/zleave/zleave.c
@@ -14,6 +14,8 @@
 #include <zephyr/mit-copyright.h>
 #include <zephyr/zephyr.h>
 
+#include <com_err.h>
+
 #ifndef lint
 static char rcsid_zlocate_c[] = "$Id$";
 #endif /* lint */
@@ -56,6 +58,8 @@ char *reminder_message = NULL;
 char buff[100];
 int use_zephyr=1, oldpid;
 
+void usage(), doalarm(), bother(), delay();
+
 main(argc, argv)
 char **argv;
 {
@@ -175,6 +179,7 @@ char **argv;
 	exit(0);
 }
 
+void
 usage()
 {
 	fprintf(stderr, "usage: zleave [[+]hhmm [-m \"Reminder Message\"]]\n\
@@ -201,6 +206,7 @@ int *hp, *mp;
 	return(1);
 }
 
+void
 doalarm(nmins)
 long nmins;
 {
@@ -302,6 +308,7 @@ long nmins;
 	exit(0);
 }
 
+void
 bother(slp, msg)
 long slp;
 char *msg;
@@ -376,6 +383,7 @@ char *msg;
  * delay is like sleep but does it in 100 sec pieces and
  * knows what zero means.
  */
+void
 delay(secs)
 long secs;
 {
diff --git a/clients/zpopnotify/zpopnotify.c b/clients/zpopnotify/zpopnotify.c
index a382707..b2f79e3 100644
--- a/clients/zpopnotify/zpopnotify.c
+++ b/clients/zpopnotify/zpopnotify.c
@@ -28,6 +28,8 @@ static char rcsid_zpopnotify_c[] = "$Id$";
 #define MAIL_CLASS "MAIL"
 #define MAIL_INSTANCE "POP"
 
+void usage();
+
 main(argc,argv)
 	int argc;
 	char *argv[];
@@ -94,6 +96,7 @@ main(argc,argv)
 	}
 }
 
+void
 usage(whoami)
 	char *whoami;
 {
diff --git a/clients/zwrite/zwrite.c b/clients/zwrite/zwrite.c
index 0b153c7..5edc779 100644
--- a/clients/zwrite/zwrite.c
+++ b/clients/zwrite/zwrite.c
@@ -34,6 +34,7 @@ Z_AuthProc auth;
 void un_tabify();
 
 char *fix_filsrv_inst();
+void usage(), send_off();
 
 main(argc, argv)
     int argc;
@@ -336,6 +337,7 @@ main(argc, argv)
     exit(0);
 }
 
+void
 send_off(notice, real)
     ZNotice_t *notice;
     int real;
@@ -444,6 +446,7 @@ send_off(notice, real)
 	exit(1);
 } 
 
+void
 usage(s)
     char *s;
 {
diff --git a/lib/ZParseNot.c b/lib/ZParseNot.c
index 765808d..6d393a0 100644
--- a/lib/ZParseNot.c
+++ b/lib/ZParseNot.c
@@ -142,7 +142,7 @@ Code_t ZParseNotice(buffer, len, notice)
     if (numfields) {
 	if (ZReadAscii32(ptr, end-ptr, &temp) == ZERR_BADFIELD)
 	    BAD_PACKET;
-	notice->z_kind = temp;
+	notice->z_kind = (ZNotice_Kind_t)temp;
 	numfields--;
 	next_field (ptr);
     }
diff --git a/server/realm.c b/server/realm.c
index 9cf8c92..1ad55fc 100644
--- a/server/realm.c
+++ b/server/realm.c
@@ -166,6 +166,7 @@ realm_send_realms()
     if (retval = (subscr_send_realm_subs(&otherrealms[cnt])) != ZERR_NONE)
       return(retval);
   }
+  return ZERR_NONE;
 }
 
 int
@@ -751,14 +752,15 @@ realm_sendit_auth(notice, who, auth, realm, ack_to_sender)
   offset = 0;
 
   /* first, build an authent */
-  retval = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE, realm, &cred);
+  retval = krb_get_cred(SERVER_SERVICE, SERVER_INSTANCE, realm->name, &cred);
   if (retval != GC_OK) {
     syslog(LOG_WARNING, "rlm_sendit_auth get_cred: %s",
            error_message(retval+krb_err_base));
     return;
   }
 
-  retval = krb_mk_req(&authent, SERVER_SERVICE, SERVER_INSTANCE, realm, 1);
+  retval = krb_mk_req(&authent, SERVER_SERVICE, SERVER_INSTANCE,
+		      realm->name, 1);
   if (retval != MK_AP_OK) {
     syslog(LOG_WARNING, "rlm_sendit_auth mk_req: %s",
            error_message(retval+krb_err_base));
diff --git a/zhm/zhm_server.c b/zhm/zhm_server.c
index bfc5054..94c0035 100644
--- a/zhm/zhm_server.c
+++ b/zhm/zhm_server.c
@@ -33,8 +33,11 @@ extern char cur_serv[], prim_serv[];
 extern void die_gracefully();
 extern unsigned long inet_addr();
 
+void hm_control(), send_back(), new_server();
+
 /* Argument is whether we are actually booting, or just attaching
  * after a server switch */
+void
 send_boot_notice(op)
 char *op;
 {
@@ -66,6 +69,7 @@ char *op;
 }
 
 /* Argument is whether we are detaching or really going down */
+void
 send_flush_notice(op)
 char *op;
 {
@@ -95,6 +99,7 @@ char *op;
      }
 }
 
+void
 find_next_server(sugg_serv)
 char *sugg_serv;
 {
@@ -168,6 +173,7 @@ char *sugg_serv;
      nservchang++;
 }
 
+void
 server_manager(notice)
 ZNotice_t *notice;
 {
@@ -198,6 +204,7 @@ ZNotice_t *notice;
     }
 }
 
+void
 hm_control(notice)
 ZNotice_t *notice;
 {
@@ -240,6 +247,7 @@ ZNotice_t *notice;
     }
 }
 
+void
 send_back(notice)
 ZNotice_t *notice;
 {
@@ -278,6 +286,7 @@ ZNotice_t *notice;
     }
 }
 
+void
 new_server(sugg_serv)
 char *sugg_serv;
 {
diff --git a/zwgc/exec.c b/zwgc/exec.c
index ad40d5b..1bf8f72 100644
--- a/zwgc/exec.c
+++ b/zwgc/exec.c
@@ -429,8 +429,8 @@ static int exec_subtree(node)
 /***************************************************************************/
 
 static char *notice_fields;
-static notice_fields_length = 0;
-static number_of_fields = 0;
+static int notice_fields_length = 0;
+static int number_of_fields = 0;
 
 static int exec_fields(node)
      Node *node;
diff --git a/zwgc/tty_filter.c b/zwgc/tty_filter.c
index dcc12c2..86ab8f9 100644
--- a/zwgc/tty_filter.c
+++ b/zwgc/tty_filter.c
@@ -218,10 +218,10 @@ typedef struct _tty_str_info {
     int len;
 
     char alignment; /* 'l', 'c', 'r', or ' ' to indicate newline */
-    int bold_p : 1;
-    int italic_p : 1;
-    int bell_p : 1;
-    int ignore: 1;
+    unsigned int bold_p : 1;
+    unsigned int italic_p : 1;
+    unsigned int bell_p : 1;
+    unsigned int ignore: 1;
 } tty_str_info;
 
 static void free_info(info)
diff --git a/zwgc/xerror.c b/zwgc/xerror.c
index 38c7fbd..33e389a 100644
--- a/zwgc/xerror.c
+++ b/zwgc/xerror.c
@@ -32,6 +32,7 @@ static int xerrortrap(dpy,xerrev)
      XErrorEvent *xerrev;
 {
    xerror_happened = 1;
+   return 0;
 }
 
 /*ARGSUSED*/
diff --git a/zwgc/xshow.c b/zwgc/xshow.c
index fa3b2ce..d970ccc 100644
--- a/zwgc/xshow.c
+++ b/zwgc/xshow.c
@@ -43,6 +43,7 @@ extern unsigned long default_bgcolor;
 extern unsigned long default_fgcolor;
 extern unsigned long x_string_to_color();
 
+void
 xshowinit()
 {
     desc_context = XUniqueContext();
diff --git a/zwgc/zephyr.c b/zwgc/zephyr.c
index 0bc403a..c5a3855 100644
--- a/zwgc/zephyr.c
+++ b/zwgc/zephyr.c
@@ -187,7 +187,7 @@ void zephyr_init(notice_handler)
      * <<<>>>
      */
     mux_add_input_source(ZGetFD(), (void (*)())handle_zephyr_input,
-			 (pointer)notice_handler);
+			 notice_handler);
     zephyr_inited = 1;
     return;
 }
-- 
cgit v1.2.3