From d6dbcb938fdeb0dee604adaaee72d8ce7dd83e37 Mon Sep 17 00:00:00 2001 From: Paul Slootman Date: Tue, 28 Apr 1998 08:35:11 +0000 Subject: [PATCH] Fixed compiler warnings from egcs. --- imontty/imontty.c | 3 ++- ipppd/main.c | 12 +++++++++--- ipppd/options.c | 2 +- ipppd/sys-linux.c | 2 +- ipppstats/ipppstats.c | 4 ++-- iprofd/iprofd.c | 8 +++++++- isdnctrl/isdnctrl.c | 10 ++++++++-- lib/isdntools.c | 4 ++++ vbox/src/rcvbox.c | 2 +- vbox/src/script.c | 2 +- vbox/src/vbox.c | 3 ++- vbox/src/vboxd.c | 3 ++- vbox/src/vboxgetty.c | 3 ++- xisdnload/xisdnload.c | 2 ++ xmonisdn/Net.c | 4 ++-- xmonisdn/xmonisdn.c | 4 +++- 16 files changed, 49 insertions(+), 19 deletions(-) diff --git a/imontty/imontty.c b/imontty/imontty.c index a80222c7..08c8b1a0 100644 --- a/imontty/imontty.c +++ b/imontty/imontty.c @@ -157,7 +157,7 @@ void scan_int(char * buffer, int (*field)[], int max) { } } -void main(int ac, char **argv) { +int main(int ac, char **argv) { FILE * isdninfo; char buf[IM_BUFSIZE]; @@ -250,4 +250,5 @@ void main(int ac, char **argv) { if( !(++lines % 2) ) printf("\n"); } + return 0; } diff --git a/ipppd/main.c b/ipppd/main.c index 8cd727b9..fae5b87e 100644 --- a/ipppd/main.c +++ b/ipppd/main.c @@ -136,7 +136,7 @@ struct protent *protocols[] = { NULL }; -void main(int argc,char **argv) +int main(int argc,char **argv) { int i,j; struct sigaction sa; @@ -284,7 +284,12 @@ void main(int argc,char **argv) #if 1 sprintf(pidfilename, "%s%s.pid", _PATH_VARRUN, "ipppd" ); #else - sprintf(pidfilename, "%s%s.%s.pid", _PATH_VARRUN, "ipppd", lns[0].devnam); + char *p; + if ((p = strrchr(lns[0].devnam, '/'))) + p++; + else + p = lns[0].devnam; + sprintf(pidfilename, "%s%s.%s.pid", _PATH_VARRUN, "ipppd", p); #endif if ((pidfile = fopen(pidfilename, "w")) != NULL) { @@ -442,6 +447,7 @@ void main(int argc,char **argv) syslog(LOG_WARNING, "unable to delete pid file: %m"); pidfilename[0] = 0; die(0); + return 0; /*NOTREACHED*/ } /* @@ -521,7 +527,7 @@ static int exit_unit(int the_unit) */ static void connect_time_expired(caddr_t arg) { - int linkunit = (int) arg; + int linkunit = (int)(long)arg; syslog(LOG_INFO, "Connect time expired"); lcp_close(linkunit, "Connect time expired"); /* Close connection */ } diff --git a/ipppd/options.c b/ipppd/options.c index 69f027b5..25c1d9da 100644 --- a/ipppd/options.c +++ b/ipppd/options.c @@ -2157,7 +2157,7 @@ static int setipxname (int slot,char **argv) fprintf (stderr, "%s: IPX router name is limited to %d characters\n", progname, - sizeof (ipxcp_wantoptions[slot].name) - 1); + (int) sizeof (ipxcp_wantoptions[slot].name) - 1); return 0; } diff --git a/ipppd/sys-linux.c b/ipppd/sys-linux.c index 9a5c1a81..62e517d1 100644 --- a/ipppd/sys-linux.c +++ b/ipppd/sys-linux.c @@ -1314,7 +1314,7 @@ int logwtmputmp (int unit,char *line, char *name, char *host) strncpy(ut.ut_user, name, sizeof(ut.ut_user)); strncpy(ut.ut_line, line, sizeof(ut.ut_line)); - time(&ut.ut_time); + ut.ut_time = time((void *)0); ut.ut_type = USER_PROCESS; ut.ut_pid = mypid; diff --git a/ipppstats/ipppstats.c b/ipppstats/ipppstats.c index 2bf2dd85..44107b5a 100644 --- a/ipppstats/ipppstats.c +++ b/ipppstats/ipppstats.c @@ -88,7 +88,7 @@ void intpr(void); void get_ppp_stats(struct ppp_stats *curp); void get_ppp_cstats(struct ppp_comp_stats *csp); -void main(int argc,char **argv) +int main(int argc,char **argv) { --argc; ++argv; while (argc > 0) { @@ -137,7 +137,7 @@ void main(int argc,char **argv) } intpr(); - exit(0); + return(0); } void usage(void) diff --git a/iprofd/iprofd.c b/iprofd/iprofd.c index d2df6f20..91ffc405 100644 --- a/iprofd/iprofd.c +++ b/iprofd/iprofd.c @@ -22,6 +22,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * Revision 1.3 1998/04/24 09:19:23 paul + * Ignore empty file when starting up instead of generating error message + * about wrong signature, there is _no_ signature! iprofd writes new data + * anyway in that case. + * * Revision 1.2 1997/02/21 13:18:27 fritz * Reformatted, changed some error-messages. * @@ -120,7 +125,7 @@ usage(void) exit(-1); } -void +int main(int argc, char **argv) { @@ -174,4 +179,5 @@ main(int argc, char **argv) default: break; } + return 0; } diff --git a/isdnctrl/isdnctrl.c b/isdnctrl/isdnctrl.c index 9dc78701..60d5283e 100644 --- a/isdnctrl/isdnctrl.c +++ b/isdnctrl/isdnctrl.c @@ -21,6 +21,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * Revision 1.19 1998/04/18 17:36:13 detabc + * modify display of callbackdelay (cbdelay) value to %.1f sec. + * if abc-extension is enabled + * * Revision 1.18 1998/03/21 17:10:36 detabc * change to use the abc-ext-options -TU on all encapsulations * the option -A (abc-router) will only works with rawip @@ -1432,9 +1436,10 @@ void check_version() { } } -void main(int argc, char **argv) +int main(int argc, char **argv) { int fd; + int rc; if ((cmd = strrchr(argv[0], '/')) != NULL) *cmd++ = '\0'; @@ -1454,6 +1459,7 @@ void main(int argc, char **argv) } - exec_args(fd,argc-1,argv+1); + rc = exec_args(fd,argc-1,argv+1); close(fd); + return rc; } diff --git a/lib/isdntools.c b/lib/isdntools.c index bfea6ed7..7ec359b5 100644 --- a/lib/isdntools.c +++ b/lib/isdntools.c @@ -19,6 +19,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log$ + * Revision 1.17 1998/03/08 12:13:49 luethje + * Patches by Paul Slootman + * * Revision 1.16 1997/06/22 22:57:08 luethje * bugfixes * @@ -126,6 +129,7 @@ #define PUBLIC /**/ #define _ISDNTOOLS_C_ +#define _GNU_SOURCE /****************************************************************************/ diff --git a/vbox/src/rcvbox.c b/vbox/src/rcvbox.c index 772ec914..2a064ce0 100644 --- a/vbox/src/rcvbox.c +++ b/vbox/src/rcvbox.c @@ -65,7 +65,7 @@ static time_t vboxrc_return_time(time_t timenow, char *timestr, int mode) else *minsstr++ = '\0'; if (mode == 0) secsint = 0; - if (mode != 0) secsint = 59; + else secsint = 59; hourint = atoi(hourstr); minsint = atoi(minsstr); diff --git a/vbox/src/script.c b/vbox/src/script.c index f04a5c81..f1e39328 100644 --- a/vbox/src/script.c +++ b/vbox/src/script.c @@ -259,7 +259,7 @@ int vbox_message_info(ClientData cd, Tcl_Interp *ip, int argc, char *argv[]) switch (field) { case 1: - printstring(ip->result, "%ld", ntohl(header.time)); + printstring(ip->result, "%ld", (long)ntohl(header.time)); break; case 2: diff --git a/vbox/src/vbox.c b/vbox/src/vbox.c index 7a700e8a..29ec2d83 100644 --- a/vbox/src/vbox.c +++ b/vbox/src/vbox.c @@ -161,7 +161,7 @@ static chtype color(int); /** The magic main... **/ /**************************************************************************/ -void main(int argc, char **argv) +int main(int argc, char **argv) { struct servent *vboxdserv; int dimension; @@ -347,6 +347,7 @@ void main(int argc, char **argv) vboxd_disconnect(); if (messagesmp) free(messagesmp); + return 0; } /**************************************************************************/ diff --git a/vbox/src/vboxd.c b/vbox/src/vboxd.c index 8086620c..b1d946cb 100644 --- a/vbox/src/vboxd.c +++ b/vbox/src/vboxd.c @@ -120,7 +120,7 @@ static struct option arguments[] = /** The magic main... **/ /**************************************************************************/ -void main(int argc, char **argv) +int main(int argc, char **argv) { int opts; @@ -202,6 +202,7 @@ void main(int argc, char **argv) handle_client_input(); leave_program(0); + return 0; } /**************************************************************************/ diff --git a/vbox/src/vboxgetty.c b/vbox/src/vboxgetty.c index 3efc4327..ea3f4246 100644 --- a/vbox/src/vboxgetty.c +++ b/vbox/src/vboxgetty.c @@ -53,7 +53,7 @@ static struct option arguments[] = /** The magic main... **/ /*************************************************************************/ -void main(int argc, char **argv) +int main(int argc, char **argv) { char *usevrc = NULL; char *device = NULL; @@ -127,6 +127,7 @@ void main(int argc, char **argv) main_program(); exit_program(SIGTERM); + return 0; /*NOTREACHED*/ } /*************************************************************************/ diff --git a/xisdnload/xisdnload.c b/xisdnload/xisdnload.c index 33e2d304..e60bd1c0 100644 --- a/xisdnload/xisdnload.c +++ b/xisdnload/xisdnload.c @@ -34,7 +34,9 @@ from the X Consortium. * */ +#include #include +#include #include #include #include diff --git a/xmonisdn/Net.c b/xmonisdn/Net.c index 62e94de1..b13ea317 100644 --- a/xmonisdn/Net.c +++ b/xmonisdn/Net.c @@ -518,7 +518,7 @@ static void Redisplay (gw, event, region) static void check_netstat (w) NetstatWidget w; { - int newstate; + int newstate = 0; struct timeval timeout; fd_set fdset; @@ -667,7 +667,7 @@ static void redraw_netstat (w) register int x, y; GC gc = w->netstat.gc; Pixel back = w->core.background_pixel; - struct _mbimage *im; + struct _mbimage *im = 0; /* center the picture in the window */ diff --git a/xmonisdn/xmonisdn.c b/xmonisdn/xmonisdn.c index a61ec6f1..4e0b4509 100644 --- a/xmonisdn/xmonisdn.c +++ b/xmonisdn/xmonisdn.c @@ -47,7 +47,7 @@ NULL}; } -void main (argc, argv) +int main (argc, argv) int argc; char **argv; { @@ -76,6 +76,8 @@ void main (argc, argv) (void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel), &wm_delete_window, 1); XtAppMainLoop (xtcontext); + + return 0; } static void quit (w, event, params, num_params)