git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd2e3fd
)
tidying
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 9 Jul 2017 15:12:45 +0000
(16:12 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 9 Jul 2017 15:12:45 +0000
(16:12 +0100)
src/src/deliver.c
patch
|
blob
|
history
src/src/dkim.c
patch
|
blob
|
history
src/src/pdkim/pdkim.c
patch
|
blob
|
history
src/src/pdkim/pdkim.h
patch
|
blob
|
history
src/src/spool_mbox.c
patch
|
blob
|
history
src/src/tls-openssl.c
patch
|
blob
|
history
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index e5c951560a0d9b6e71db3355ea0611bd4ecc7a4d..9b77f7d17210400becb0cbee6325261ee5b2ca4c 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-7077,7
+7077,7
@@
phase, to minimize cases of half-done things. */
DEBUG(D_deliver)
debug_printf(">>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>\n");
DEBUG(D_deliver)
debug_printf(">>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>\n");
-cancel_cutthrough_connection(TRUE, "deliveries are done");
+cancel_cutthrough_connection(TRUE,
US
"deliveries are done");
/* Root privilege is no longer needed */
/* Root privilege is no longer needed */
@@
-8507,7
+8507,7
@@
if (cutthrough.fd >= 0 && cutthrough.callout_hold_only)
}
else
{
}
else
{
- cancel_cutthrough_connection(TRUE, "non-continued delivery");
+ cancel_cutthrough_connection(TRUE,
US
"non-continued delivery");
(void) child_exec_exim(exec_type, FALSE, NULL, FALSE, 2, US"-Mc", message_id);
}
/* Control does not return here. */
(void) child_exec_exim(exec_type, FALSE, NULL, FALSE, 2, US"-Mc", message_id);
}
/* Control does not return here. */
diff --git
a/src/src/dkim.c
b/src/src/dkim.c
index 33e7bc84cdc134d89111f7d4ece0e8d9d4c41bb6..519deabcfd38d9ef4771ca0501bc7adbc8be693f 100644
(file)
--- a/
src/src/dkim.c
+++ b/
src/src/dkim.c
@@
-104,7
+104,7
@@
int rc;
store_pool = POOL_PERM;
if ( dkim_collect_input
store_pool = POOL_PERM;
if ( dkim_collect_input
- && (rc = pdkim_feed(dkim_verify_ctx,
CS
data, len)) != PDKIM_OK)
+ && (rc = pdkim_feed(dkim_verify_ctx, data, len)) != PDKIM_OK)
{
dkim_collect_error = pdkim_errstr(rc);
log_write(0, LOG_MAIN,
{
dkim_collect_error = pdkim_errstr(rc);
log_write(0, LOG_MAIN,
@@
-475,7
+475,7
@@
pdkim_signature *signature;
int pdkim_canon;
int pdkim_rc;
int sread;
int pdkim_canon;
int pdkim_rc;
int sread;
-char buf[4096];
+
us
char buf[4096];
int save_errno = 0;
int old_pool = store_pool;
int save_errno = 0;
int old_pool = store_pool;
diff --git
a/src/src/pdkim/pdkim.c
b/src/src/pdkim/pdkim.c
index 61e3161d43eeb31eec9c885934e2578c18e1cac6..d41b60f1361b510a9ddc6ecd8a13a8424cb67821 100644
(file)
--- a/
src/src/pdkim/pdkim.c
+++ b/
src/src/pdkim/pdkim.c
@@
-155,7
+155,7
@@
switch(status)
case PDKIM_ERR_BUFFER_TOO_SMALL: return US"BUFFER_TOO_SMALL";
case PDKIM_SIGN_PRIVKEY_WRAP: return US"PRIVKEY_WRAP";
case PDKIM_SIGN_PRIVKEY_B64D: return US"PRIVKEY_B64D";
case PDKIM_ERR_BUFFER_TOO_SMALL: return US"BUFFER_TOO_SMALL";
case PDKIM_SIGN_PRIVKEY_WRAP: return US"PRIVKEY_WRAP";
case PDKIM_SIGN_PRIVKEY_B64D: return US"PRIVKEY_B64D";
- default: return "(unknown)";
+ default: return
US
"(unknown)";
}
}
}
}
@@
-999,7
+999,7
@@
return PDKIM_OK;
#define HEADER_BUFFER_FRAG_SIZE 256
DLLEXPORT int
#define HEADER_BUFFER_FRAG_SIZE 256
DLLEXPORT int
-pdkim_feed(pdkim_ctx *
ctx, char *
data, int len)
+pdkim_feed(pdkim_ctx *
ctx, uschar *
data, int len)
{
int p, rc;
{
int p, rc;
diff --git
a/src/src/pdkim/pdkim.h
b/src/src/pdkim/pdkim.h
index 8c477f744cbd3f49b6ba0a7b05af71c15d27ba0d..78e3c3c8b148f11b84e6e5e5ac70e4a1c33f39cc 100644
(file)
--- a/
src/src/pdkim/pdkim.h
+++ b/
src/src/pdkim/pdkim.h
@@
-299,7
+299,7
@@
int pdkim_set_optional (pdkim_ctx *, char *, char *,int, int,
unsigned long);
DLLEXPORT
unsigned long);
DLLEXPORT
-int pdkim_feed (pdkim_ctx *, char *, int);
+int pdkim_feed (pdkim_ctx *,
us
char *, int);
DLLEXPORT
int pdkim_feed_finish (pdkim_ctx *, pdkim_signature **, const uschar **);
DLLEXPORT
int pdkim_feed_finish (pdkim_ctx *, pdkim_signature **, const uschar **);
diff --git
a/src/src/spool_mbox.c
b/src/src/spool_mbox.c
index 8ca468a856253bc8b5d1cbaacd5ef4da5745292a..de5830d645bd11030d0e6b964f7a557b8d27ffdb 100644
(file)
--- a/
src/src/spool_mbox.c
+++ b/
src/src/spool_mbox.c
@@
-148,7
+148,7
@@
if (!spool_mbox_ok)
if (!spool_file_wireformat || source_file_override)
j = fread(buffer, 1, sizeof(buffer), data_file);
else /* needs CRLF -> NL */
if (!spool_file_wireformat || source_file_override)
j = fread(buffer, 1, sizeof(buffer), data_file);
else /* needs CRLF -> NL */
- if ((s =
fgets(
buffer, sizeof(buffer), data_file)))
+ if ((s =
US fgets(CS
buffer, sizeof(buffer), data_file)))
{
uschar * p = s + Ustrlen(s) - 1;
{
uschar * p = s + Ustrlen(s) - 1;
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index ab76492bc75e42f96ca9fdc06a37db96ce570095..19342358a35288083cb01944044a08e555e5fbd0 100644
(file)
--- a/
src/src/tls-openssl.c
+++ b/
src/src/tls-openssl.c
@@
-2576,8
+2576,8
@@
SSL *ssl = is_server ? server_ssl : client_ssl;
static uschar * corked = NULL;
static int c_size = 0, c_len = 0;
static uschar * corked = NULL;
static int c_size = 0, c_len = 0;
-DEBUG(D_tls) debug_printf("%s(%p, %
d
%s)\n", __FUNCTION__,
- buff, len, more ? ", more" : "");
+DEBUG(D_tls) debug_printf("%s(%p, %
lu
%s)\n", __FUNCTION__,
+ buff,
(ulong)
len, more ? ", more" : "");
/* Lacking a CORK or MSG_MORE facility (such as GnuTLS has) we copy data when
"more" is notified. This hack is only ok if small amounts are involved AND only
/* Lacking a CORK or MSG_MORE facility (such as GnuTLS has) we copy data when
"more" is notified. This hack is only ok if small amounts are involved AND only