diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-14 21:37:49 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-10-14 21:37:49 +0100 |
| commit | 059f2aced50773fa38661a5a30c54260aee4bf55 (patch) | |
| tree | 52248d51eed5beeaf6d285b354431f188f1cb34c /src | |
| parent | ce80533b305c56d57cb7ec1484491f191132cf84 (diff) | |
tidying
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/malware.c | 15 | ||||
| -rw-r--r-- | src/src/transports/smtp_socks.c | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/src/malware.c b/src/src/malware.c index 4b28760af..069a54483 100644 --- a/src/src/malware.c +++ b/src/src/malware.c @@ -191,11 +191,12 @@ static const pcre * fprot6d_re_virus = NULL; /******************************************************************************/ +#ifndef DISABLE_MAL_KAV /* Routine to check whether a system is big- or little-endian. Ripped from http://www.faqs.org/faqs/graphics/fileformats-faq/part4/section-7.html Needed for proper kavdaemon implementation. Sigh. */ -#define BIG_MY_ENDIAN 0 -#define LITTLE_MY_ENDIAN 1 +# define BIG_MY_ENDIAN 0 +# define LITTLE_MY_ENDIAN 1 static int test_byte_order(void); static inline int test_byte_order() @@ -204,6 +205,7 @@ test_byte_order() char *byte = CS &word; return(byte[0] ? LITTLE_MY_ENDIAN : BIG_MY_ENDIAN); } +#endif BOOL malware_ok = FALSE; @@ -262,13 +264,6 @@ m_panic_defer_3(struct scan * scanent, const uschar * hostport, (void) close(fd_to_close); return m_panic_defer(scanent, hostport, str); } -static inline int -m_log_defer_3(struct scan * scanent, const uschar * hostport, - const uschar * str, int fd_to_close) -{ -(void) close(fd_to_close); -return m_log_defer(scanent, hostport, str); -} /*************************************************/ @@ -2287,7 +2282,7 @@ malware_show_supported(FILE * f) { struct scan * sc; fprintf(f, "Malware:"); -for (sc = m_scans; sc->scancode != -1; sc++) fprintf(f, " %s", sc->name); +for (sc = m_scans; sc->scancode != (scanner_t)-1; sc++) fprintf(f, " %s", sc->name); fprintf(f, "\n"); } diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c index 77cf623e7..c7415c357 100644 --- a/src/src/transports/smtp_socks.c +++ b/src/src/transports/smtp_socks.c @@ -85,7 +85,7 @@ else if (Ustrncmp(opt, "name=", 5) == 0) else if (Ustrncmp(opt, "pass=", 5) == 0) sob->auth_pwd = opt + 5; else if (Ustrncmp(opt, "port=", 5) == 0) - sob->port = atoi(opt + 5); + sob->port = atoi(CCS opt + 5); else if (Ustrncmp(opt, "tmo=", 4) == 0) sob->timeout = atoi(CCS opt + 4); else if (Ustrncmp(opt, "pri=", 4) == 0) |