From 46682a6793c54ef6cbccad08283ac35205622aac Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 4 Apr 2018 12:38:38 +0100
Subject: [PATCH] compiler quietening
---
src/src/malware.c | 19 ++++++++++---------
src/src/pdkim/pdkim.c | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/src/malware.c b/src/src/malware.c
index 479c3db1d..68eda4049 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -180,12 +180,14 @@ extern uschar spooled_message_id[MESSAGE_ID_LENGTH+1];
/* Some (currently avast only) use backslash escaped whitespace,
this function undoes these escapes */
+
static inline void
-unescape(char *p) {
- uschar *p0;
- for (; *p; ++p)
- if (*p == '\\' && (isspace(p[1]) || p[1] == '\\'))
- for (p0 = p; *p0; ++p0) *p0 = p0[1];
+unescape(uschar *p)
+{
+uschar *p0;
+for (; *p; ++p)
+ if (*p == '\\' && (isspace(p[1]) || p[1] == '\\'))
+ for (p0 = p; *p0; ++p0) *p0 = p0[1];
}
/* --- malware_*_defer --- */
@@ -1921,7 +1923,6 @@ b_seek: err = errno;
#ifndef DISABLE_MAL_AVAST
case M_AVAST: /* "avast" scanner type ----------------------------------- */
{
- int ovector[3*3];
uschar buf[1024];
uschar * scanrequest;
enum {AVA_HELO, AVA_OPT, AVA_RSP, AVA_DONE} avast_stage;
@@ -2093,9 +2094,9 @@ b_seek: err = errno;
endloop:
- if (nread == -1) error_message = "EOF from scanner";
- else if (nread < 0) error_message = "timeout from scanner";
- else if (nread == 0) error_message = "got nothing from scanner";
+ if (nread == -1) error_message = US"EOF from scanner";
+ else if (nread < 0) error_message = US"timeout from scanner";
+ else if (nread == 0) error_message = US"got nothing from scanner";
else if (buf[0] != '2') error_message = buf;
DEBUG(D_acl) debug_printf_indent("sent to avast QUIT\n");
diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 78d30979d..149cff86c 100644
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -792,7 +792,7 @@ pdkim_signature * sig;
for (b = ctx->bodyhash; b; b = b->next) /* Finish hashes */
{
- DEBUG(D_acl) debug_printf("PDKIM: finish bodyhash %d/%d/%d len %ld\n",
+ DEBUG(D_acl) debug_printf("PDKIM: finish bodyhash %d/%d/%ld len %ld\n",
b->hashtype, b->canon_method, b->bodylength, b->signed_body_bytes);
exim_sha_finish(&b->body_hash_ctx, &b->bh);
}
--
2.25.1