From 1dcb4ccf8a1285335d964f7c1424d8409bc82df5 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Tue, 6 Jun 2006 20:33:03 +1000 Subject: [PATCH] Create Makefile and get it to compile with -Wall --- broadcast.c | 16 ++++++++-------- commands.c | 18 +++++++++--------- control.c | 4 ++-- daemon.c | 2 +- error.c | 6 +++--- mainloop.c | 4 ++-- meta.c | 2 +- metad.c | 4 ++-- metad.h | 4 +++- read_config.c | 2 +- sendcmd.c | 6 +++--- skip.c | 7 ++++--- strccmp.c | 3 ++- strlistdup.c | 5 ++--- strsplit.c | 3 +-- 15 files changed, 44 insertions(+), 42 deletions(-) diff --git a/broadcast.c b/broadcast.c index b1ffeec..8baf55c 100644 --- a/broadcast.c +++ b/broadcast.c @@ -20,8 +20,6 @@ int udp_port(void); static struct ifconf iflist; static int interfaces; static int sock; -static char *packet; -static struct servent *sv; static int ifconfinit() { @@ -30,14 +28,16 @@ static int ifconfinit() iflist.ifc_len = sizeof(buf); iflist.ifc_buf = buf; -/* printf("ifc_len = %d\n", iflist.ifc_len); /**/ +/* printf("ifc_len = %d\n", iflist.ifc_len); / **/ if (ioctl(sock, SIOCGIFCONF, (char *)&iflist)< 0) return -1; -/* printf("ifc_len = %d\n", iflist.ifc_len); /**/ +/* printf("ifc_len = %d\n", iflist.ifc_len); / **/ interfaces = iflist.ifc_len / sizeof(struct ifreq); -/* printf("interfaces = %d\n",interfaces); /**/ -/* for (in=0; inenabled) { - log(LOG_INFO, "Disable request from %s for %s", host, sv->service); + logmsg(LOG_INFO, "Disable request from %s for %s", host, sv->service); (sv->class->disable_service)(sv); sv->enabled = 0; } @@ -83,7 +83,7 @@ static void do_enable(char **args, char *host, void *con) else for ( ; sv ; sv=find_service(NULL)) if (!sv->enabled) { - log(LOG_INFO, "Enable request from %s for %s", host, sv->service); + logmsg(LOG_INFO, "Enable request from %s for %s", host, sv->service); (sv->class->register_service)(sv); sv->enabled = 1; } @@ -114,7 +114,7 @@ static void do_run(char **args, char *host, void *con) if ((*pp)->hold_time != 0) (*pp)->hold_time = 1; sv->next_hold = 2; - log(LOG_INFO,"starting %s for %s : arg = %s", sv->service, host, arg); + logmsg(LOG_INFO,"starting %s for %s : arg = %s", sv->service, host, arg); new_proc(sv, env); } free(arg); @@ -142,7 +142,7 @@ static void do_kill(char **args, char *host, void *con) proc_t *pp = skip_search(allprocs, &pid); if (pp) { - log(LOG_INFO, "killing %s for %s", args[2], host); + logmsg(LOG_INFO, "killing %s for %s", args[2], host); if ((*pp)->exit_time == 0) kill((*pp)->pid, sig); else if ((*pp)->it_forked > 1) @@ -159,7 +159,7 @@ static void do_kill(char **args, char *host, void *con) for (pp = skip_first(sv->proc_list) ; pp ; pp = skip_next(pp)) if ((*pp)->exit_time == 0 || (*pp)->it_forked) { - log(LOG_INFO, + logmsg(LOG_INFO, "signalling %s:%d with %d for %s", sv->service, (*pp)->exit_time?(*pp)->it_forked:(*pp)->pid, sig, host); @@ -179,7 +179,7 @@ static void do_reread(char **args, char *host, void *con) { char *errs = NULL; int old; - log(LOG_INFO, "Rereading config file for %s", host); + logmsg(LOG_INFO, "Rereading config file for %s", host); old= errors_to(ERROR_STRING, &errs); if (read_config(services, NULL) != 0) return_error(con, "%s", errs); @@ -214,7 +214,7 @@ static void do_list(char **args, char *host, void *con) void do_restart(char **args, char *host, void *con) { - log(LOG_INFO, "About to restart for %s", host); + logmsg(LOG_INFO, "About to restart for %s", host); control_close(); prepare_restart(); restart(); diff --git a/control.c b/control.c index 1d62968..a5e6d55 100644 --- a/control.c +++ b/control.c @@ -185,7 +185,7 @@ void check_control(void) char host[1024]; int n; struct sockaddr_in sa; - int salen = sizeof(sa); + unsigned int salen = sizeof(sa); n = recvfrom(udp_sock, buf, sizeof(buf)-1, 0, (struct sockaddr *)&sa, &salen ); if (n>0 && address_ok(&sa, host)) { @@ -274,7 +274,7 @@ void check_control(void) if (readyon(tcp_listen)) { struct sockaddr_in sa; - int salen = sizeof(sa); + unsigned int salen = sizeof(sa); tcpcon.buflen = 0; tcpcon.outbuf = NULL; tcpcon.sock = accept(tcp_listen, (struct sockaddr *)&sa, &salen); diff --git a/daemon.c b/daemon.c index 88c4592..c7c016a 100644 --- a/daemon.c +++ b/daemon.c @@ -82,7 +82,7 @@ static void daemon_check(service_t sv) static void daemon_copy(service_t from, service_t to) { /* copy the classinfo - min and period */ - daemon_t n,o; + daemon_t n; // o; if (from) { /* no special state to copy diff --git a/error.c b/error.c index 43262bb..db8cf0c 100644 --- a/error.c +++ b/error.c @@ -61,9 +61,9 @@ void error(char *mesg, char *a, char *b, char *c) } #ifdef STDARGS -void log(int level,...) +void logmsg(int level,...) #else -void log(va_alist) +void logmsg(va_alist) va_dcl #endif { @@ -107,6 +107,6 @@ va_dcl void dolog(service_t sv, proc_t p, char *buf) { - log(LOG_INFO, "%s: %d: %s\n", sv->service, p->pid, buf); + logmsg(LOG_INFO, "%s: %d: %s\n", sv->service, p->pid, buf); } diff --git a/mainloop.c b/mainloop.c index c7ea270..21da64d 100644 --- a/mainloop.c +++ b/mainloop.c @@ -122,9 +122,9 @@ void main_loop() (*pp)->status = saved_pids[i].status; (*pp)->exit_time = saved_pids[i].time;; select_tv.tv_sec = 0; - log(LOG_INFO, "process %d (%s) exited - status 0x%04x", saved_pids[i].pid, (*pp)->service->service, (*pp)->status); + logmsg(LOG_INFO, "process %d (%s) exited - status 0x%04x", saved_pids[i].pid, (*pp)->service->service, (*pp)->status); } else - log(LOG_INFO, "process %d exited - status 0x%04x", saved_pids[i].pid, saved_pids[i].status); + logmsg(LOG_INFO, "process %d exited - status 0x%04x", saved_pids[i].pid, saved_pids[i].status); saved_pids[i].pid = 0; } diff --git a/meta.c b/meta.c index 29205be..49a4e4e 100644 --- a/meta.c +++ b/meta.c @@ -85,7 +85,7 @@ void help() int send_cmd(char *cmd, int udp, char *host, int verbose); -void main(int argc, char *argv[]) +int main(int argc, char *argv[]) { void *cmds = dl_head(); void *hosts = dl_head(); diff --git a/metad.c b/metad.c index cd44de0..9586578 100644 --- a/metad.c +++ b/metad.c @@ -7,7 +7,7 @@ #endif char **gargv; -void main(int argc, char *argv[]) +int main(int argc, char *argv[]) { gargv = argv; @@ -29,5 +29,5 @@ void main(int argc, char *argv[]) open("/dev/null", O_RDONLY); } main_loop(); - /* NOT REACHED */ + exit(0); } diff --git a/metad.h b/metad.h index 395525c..2728ad8 100644 --- a/metad.h +++ b/metad.h @@ -119,11 +119,12 @@ void init_recv(char*); char *prtime(time_t); int udp_port(void); int tcp_port(void); +void nodelay(int socket); int strccmp(char*, char*); #ifndef IN_ERROR void error(char *mesg,...); -void log(int, char*, ...); +void logmsg(int, char*, ...); #endif #define ERROR_STDERR 0 #define ERROR_SYSLOG 1 @@ -131,6 +132,7 @@ void log(int, char*, ...); int errors_to(int where, char **place); char **strlistdup(char **l); +void strlistfree(char **l); char **strsplit(char *line, char *sep); /*char *strdup(char*);*/ diff --git a/read_config.c b/read_config.c index f9c003e..feab240 100644 --- a/read_config.c +++ b/read_config.c @@ -2,7 +2,7 @@ #include "metad.h" #undef NULL #include -#include +#include "skip.h" /* read the config file * diff --git a/sendcmd.c b/sendcmd.c index 7f115e3..61094c8 100644 --- a/sendcmd.c +++ b/sendcmd.c @@ -200,11 +200,11 @@ static void list_service(char *host, int verbose) int max, cnt, enabled; int i; int class; - char *classname; + char *classname=NULL; char *pidfile = NULL; int watch_output = 0; - int min, period, last; - int proto, port, active, backlog; + int min=0, period=0, last; + int proto, port=0, active=0, backlog=0; sname = get_str(); max = get_int(); diff --git a/skip.c b/skip.c index d7aca1e..06bba30 100644 --- a/skip.c +++ b/skip.c @@ -16,6 +16,7 @@ */ #include #include +#include #define false 0 #define true 1 @@ -136,7 +137,7 @@ valueType value; int k; node update[MaxNumberOfLevels]; node p,q; - int cm; + int cm=0; p = l->header; for (k=l->level ; k>=0 ; k--) @@ -180,7 +181,7 @@ keyType key; int k, m; node update[MaxNumberOfLevels]; node p,q; - int cm; + int cm = 0; p = l->header; @@ -217,7 +218,7 @@ keyType key; { int k; node p; - int cm; + int cm = 0; p = l->header; for (k=l->level ; k>=0 ; k--) diff --git a/strccmp.c b/strccmp.c index 36b20d4..a4de904 100644 --- a/strccmp.c +++ b/strccmp.c @@ -1,9 +1,10 @@ +#include int strnccmp(a,b, n) char *a, *b; int n; { - char ac, bc; + char ac=0, bc=0; while(n--) { diff --git a/strlistdup.c b/strlistdup.c index 489f943..a3f78c3 100644 --- a/strlistdup.c +++ b/strlistdup.c @@ -1,9 +1,8 @@ /* duplicate a list of strings */ -#define NULL ((void *)0) -char *strdup(char *); -void *malloc(int); +#include +#include char **strlistdup(char **l) { diff --git a/strsplit.c b/strsplit.c index 7f82a7c..45396d1 100644 --- a/strsplit.c +++ b/strsplit.c @@ -1,3 +1,4 @@ +#include #include #include @@ -18,8 +19,6 @@ char *s, *fs; register unsigned i, num; static char quote[] = "'"; - extern char *malloc(); - if((ns = malloc((unsigned) strlen(s) + 1)) == NULL) return NULL; sp = s; -- 2.39.5