You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2009/03/05 00:41:32 UTC
svn commit: r750232 - in /spamassassin/trunk/spamc: libspamc.c spamc.c
Author: jm
Date: Wed Mar 4 23:41:32 2009
New Revision: 750232
URL: http://svn.apache.org/viewvc?rev=750232&view=rev
Log:
bug 6047: some win32 compiler-warnings cleanup in spamc. thanks to Nico Prenzel
Modified:
spamassassin/trunk/spamc/libspamc.c
spamassassin/trunk/spamc/spamc.c
Modified: spamassassin/trunk/spamc/libspamc.c
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamc/libspamc.c?rev=750232&r1=750231&r2=750232&view=diff
==============================================================================
--- spamassassin/trunk/spamc/libspamc.c (original)
+++ spamassassin/trunk/spamc/libspamc.c Wed Mar 4 23:41:32 2009
@@ -445,13 +445,11 @@
int ret;
#ifdef SPAMC_HAS_ADDRINFO
struct addrinfo *res = NULL;
+ char port[SPAMC_MAXSERV-1]; /* port, for logging */
#else
int res = PF_INET;
#endif
-
char host[SPAMC_MAXHOST-1]; /* hostname, for logging */
- char port[SPAMC_MAXSERV-1]; /* port, for logging */
-
int connect_retries, retry_sleep;
assert(tp != 0);
@@ -1837,15 +1835,15 @@
int transport_setup(struct transport *tp, int flags)
{
#ifdef SPAMC_HAS_ADDRINFO
- struct addrinfo hints, *res, *addrp;
+ struct addrinfo hints, *res, *addrp;
char port[6];
+ int origerr;
#else
struct hostent *hp;
char **addrp;
#endif
char *hostlist, *hostname;
int errbits;
- int origerr;
#ifdef _WIN32
/* Start Winsock up */
Modified: spamassassin/trunk/spamc/spamc.c
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamc/spamc.c?rev=750232&r1=750231&r2=750232&view=diff
==============================================================================
--- spamassassin/trunk/spamc/spamc.c (original)
+++ spamassassin/trunk/spamc/spamc.c Wed Mar 4 23:41:32 2009
@@ -772,16 +772,16 @@
goto finish;
}
}
-
+
ret = get_current_user(&username);
if (ret != EX_OK)
goto finish;
-
+
if ((flags & SPAMC_RANDOMIZE_HOSTS) != 0) {
/* we don't need strong randomness; this is just so we pick
* a random host for loadbalancing.
*/
- srand(getpid() ^ time(NULL));
+ srand(getpid() ^ (unsigned int)time(NULL));
}
/**********************************************************************