From: Henrik Nordstrom Date: Sun, 20 Sep 2009 20:20:42 +0000 (+0200) Subject: Bug #2777: Various syntax warnings detected on OpenSolaris. X-Git-Tag: SQUID_3_2_0_1~701 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52631ccc0f9c069bc6d0172938d8f0452ef59f95;p=thirdparty%2Fsquid.git Bug #2777: Various syntax warnings detected on OpenSolaris. --- diff --git a/src/comm.h b/src/comm.h index b15f8dfcd8..1d1786b33c 100644 --- a/src/comm.h +++ b/src/comm.h @@ -25,6 +25,7 @@ typedef enum { #if USE_IPV6 COMM_ERR_PROTOCOL = -11, /* IPv4 or IPv6 cannot be used on the fd socket */ #endif + COMM_ERR__END__ = -999999 /* Dummy entry to make syntax valid (comma on line above), do not use. New entries added above */ } comm_err_t; class DnsLookupDetails; diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc index 31e929464d..43c05e2cff 100644 --- a/src/ident/Ident.cc +++ b/src/ident/Ident.cc @@ -80,7 +80,7 @@ Ident::IdentConfig Ident::TheConfig; /**** PRIVATE FUNCTIONS ****/ -static void +void Ident::identCallback(IdentStateData * state, char *result) { IdentClient *client; @@ -99,7 +99,7 @@ Ident::identCallback(IdentStateData * state, char *result) } } -static void +void Ident::Close(int fdnotused, void *data) { IdentStateData *state = (IdentStateData *)data; @@ -110,7 +110,7 @@ Ident::Close(int fdnotused, void *data) cbdataFree(state); } -static void +void Ident::Timeout(int fd, void *data) { IdentStateData *state = (IdentStateData *)data; @@ -119,7 +119,7 @@ Ident::Timeout(int fd, void *data) comm_close(fd); } -static void +void Ident::ConnectDone(int fd, const DnsLookupDetails &, comm_err_t status, int xerrno, void *data) { IdentStateData *state = (IdentStateData *)data; @@ -155,7 +155,7 @@ Ident::ConnectDone(int fd, const DnsLookupDetails &, comm_err_t status, int xerr commSetTimeout(fd, Ident::TheConfig.timeout, Ident::Timeout, state); } -static void +void Ident::ReadReply(int fd, char *buf, size_t len, comm_err_t flag, int xerrno, void *data) { IdentStateData *state = (IdentStateData *)data; @@ -194,7 +194,7 @@ Ident::ReadReply(int fd, char *buf, size_t len, comm_err_t flag, int xerrno, voi comm_close(fd); } -static void +void Ident::ClientAdd(IdentStateData * state, IDCB * callback, void *callback_data) { IdentClient *c = (IdentClient *)xcalloc(1, sizeof(*c));