diff options
| author |  Karl Ramm <kcr@mit.edu> | 2008-01-21 07:57:32 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2008-01-21 07:57:32 +0000 |
| commit | ee442551e1531712226a3a3ba26afff466100bb5 (patch) | |
| tree | d7907b07baecce7abe3940bec566b3bf56596f2f /server/server.c | |
| parent | e6fb0737027ee97d911e8d507b1db37446067d10 (diff) | |
passes gcc -Wall with no warnings other than des cryppt C_block sadness and getsid problem
Diffstat (limited to 'server/server.c')
| -rw-r--r-- | server/server.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/server/server.c b/server/server.c index 2132a8e..809c419 100644 --- a/server/server.c +++ b/server/server.c @@ -471,7 +471,7 @@ server_timo(void *arg) auth = 0; break; default: - syslog(LOG_ERR,"Bad server state, server 0x%x\n",which); + syslog(LOG_ERR,"Bad server state, server 0x%x\n", (int)which); abort(); } /* now he's either TARDY, STARTING, or DEAD @@ -880,9 +880,9 @@ send_stats(struct sockaddr_in *who) do it this way. */ vers = get_version(); - sprintf(buf, "%d pkts", npackets); + sprintf(buf, "%lu pkts", npackets); pkts = strsave(buf); - sprintf(buf, "%d seconds operational",NOW - uptime); + sprintf(buf, "%ld seconds operational",NOW - uptime); upt = strsave(buf); #ifdef OLD_COMPAT @@ -1317,7 +1317,6 @@ send_msg_list(struct sockaddr_in *who, char *pack; int packlen; Code_t retval; - Unacked *nacked; memset (¬ice, 0, sizeof(notice)); @@ -1438,7 +1437,7 @@ server_forw_reliable(Server *server, nacked->uid = notice->z_uid; nacked->timer = timer_set_rel(rexmit_times[0], srv_rexmit, nacked); hashval = SRV_NACKTAB_HASHVAL(nacked->dest.srv_idx, nacked->uid); - LIST_INSERT(&srv_nacktab[hashval], nacked); + Unacked_insert(&srv_nacktab[hashval], nacked); } /* @@ -1490,7 +1489,7 @@ srv_nack_cancel(ZNotice_t *notice, && ZCompareUID(&nacked->uid, ¬ice->z_uid)) { timer_reset(nacked->timer); free(nacked->packet); - LIST_DELETE(nacked); + Unacked_delete(nacked); free(nacked); return; } @@ -1520,7 +1519,7 @@ srv_rexmit(void *arg) #if 0 zdbug((LOG_DEBUG, "cancelling send to dead server")); #endif - LIST_DELETE(packet); + Unacked_delete(packet); free(packet->packet); srv_nack_release(&otherservers[packet->dest.srv_idx]); free(packet); @@ -1559,7 +1558,7 @@ srv_nack_release(Server *server) next = nacked->next; if (nacked->dest.srv_idx == server - otherservers) { timer_reset(nacked->timer); - LIST_DELETE(nacked); + Unacked_delete(nacked); free(nacked->packet); free(nacked); } |