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:
9e716cd
)
tidying: char signedness
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 10 Apr 2016 15:51:16 +0000
(16:51 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 10 Apr 2016 16:17:19 +0000
(17:17 +0100)
src/OS/os.c-BSDI
patch
|
blob
|
history
src/src/environment.c
patch
|
blob
|
history
src/src/os.c
patch
|
blob
|
history
src/src/osfunctions.h
patch
|
blob
|
history
src/src/tls.c
patch
|
blob
|
history
src/src/transports/smtp.c
patch
|
blob
|
history
diff --git
a/src/OS/os.c-BSDI
b/src/OS/os.c-BSDI
index 43e5bb147fcdcf559887e7de5e1d02c594de96e5..03a7a1ceff2ac546db2084ec0a564b95e8079bcb 100644
(file)
--- a/
src/OS/os.c-BSDI
+++ b/
src/OS/os.c-BSDI
@@
-12,8
+12,8
@@
src/os.c file. */
#define OS_UNSETENV
int
#define OS_UNSETENV
int
-os_unsetenv(const
char *
name)
+os_unsetenv(const
uschar *
name)
{
{
-
unsetenv(
name);
-
return 0;
+
unsetenv(CS
name);
+return 0;
}
}
diff --git
a/src/src/environment.c
b/src/src/environment.c
index b768a0fd6e158a383e2eb489a67cd16c1b280cd8..c394eb7e7b9f9b31b576857cbe27db5fc105c615 100644
(file)
--- a/
src/src/environment.c
+++ b/
src/src/environment.c
@@
-44,11
+44,12
@@
else if (Ustrcmp(keep_environment, "*") != 0)
/* It's considered broken if we do not find the '=', according to
Florian Weimer. For now we ignore such strings. unsetenv() would complain,
getenv() would complain. */
/* It's considered broken if we do not find the '=', according to
Florian Weimer. For now we ignore such strings. unsetenv() would complain,
getenv() would complain. */
- uschar *eqp = Ustrchr(*p, '=');
+ uschar *
eqp = Ustrchr(*p, '=');
if (eqp)
{
if (eqp)
{
- uschar *name = string_copyn(*p, eqp - *p);
+ uschar * name = string_copyn(*p, eqp - *p);
+
if (OK != match_isinlist(name, CUSS &keep_environment,
0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
if (os_unsetenv(name) < 0) return FALSE;
if (OK != match_isinlist(name, CUSS &keep_environment,
0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
if (os_unsetenv(name) < 0) return FALSE;
@@
-60,11
+61,11
@@
else if (Ustrcmp(keep_environment, "*") != 0)
}
if (add_environment)
{
}
if (add_environment)
{
- uschar *p;
+ uschar *
p;
int sep = 0;
int sep = 0;
- const uschar* envlist = add_environment;
- while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
-
putenv(CS p);
+ const uschar
* envlist = add_environment;
+
+
while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
putenv(CS p);
}
return TRUE;
}
return TRUE;
diff --git
a/src/src/os.c
b/src/src/os.c
index 689ebfb1b16adcd2c273bc7f02ac25612f9f63eb..1cde1b8ecde19ff2aa030819a52d58398cc9d0b7 100644
(file)
--- a/
src/src/os.c
+++ b/
src/src/os.c
@@
-844,9
+844,9
@@
os_get_dns_resolver_res(void)
#if !defined(OS_UNSETENV)
int
#if !defined(OS_UNSETENV)
int
-os_unsetenv(const
char *
name)
+os_unsetenv(const
uschar *
name)
{
{
-
return unsetenv(
name);
+
return unsetenv(CS
name);
}
#endif
}
#endif
@@
-862,24
+862,24
@@
may not even do this. If the OS supports getcwd(NULL, 0) we'll use
this, for all other systems we provide our own getcwd() */
#if !defined(OS_GETCWD)
this, for all other systems we provide our own getcwd() */
#if !defined(OS_GETCWD)
-char *
-os_getcwd(
char *
buffer, size_t size)
+
us
char *
+os_getcwd(
uschar *
buffer, size_t size)
{
{
-return getcwd(buffer, size);
+return getcwd(
CS
buffer, size);
}
#else
#ifndef PATH_MAX
# define PATH_MAX 4096
#endif
}
#else
#ifndef PATH_MAX
# define PATH_MAX 4096
#endif
-char *
-os_getcwd(
char *
buffer, size_t size)
+
us
char *
+os_getcwd(
uschar *
buffer, size_t size)
{
void *rc;
if (!size) size = PATH_MAX;
{
void *rc;
if (!size) size = PATH_MAX;
-if (!buffer && !(buffer =
(char*)
malloc(size))) return NULL;
-if (!(buffer = getcwd(buffer, size))) return NULL;
-return realloc(buffer, strlen(buffer) + 1);
+if (!buffer && !(buffer =
US
malloc(size))) return NULL;
+if (!(buffer = getcwd(
CS
buffer, size))) return NULL;
+return realloc(
CS
buffer, strlen(buffer) + 1);
}
#endif
}
#endif
diff --git
a/src/src/osfunctions.h
b/src/src/osfunctions.h
index a8e87fc3e433928c0ff7be5387b64eba1cfe6d5e..4e6e9a91c9e86db3ece888d0ca13b897ffc91de3 100644
(file)
--- a/
src/src/osfunctions.h
+++ b/
src/src/osfunctions.h
@@
-33,10
+33,10
@@
extern const char *os_strexit(int); /* char to match os_strsignal */
extern const char *os_strsignal(int); /* char to match strsignal in some OS */
#endif
#ifndef os_unsetenv
extern const char *os_strsignal(int); /* char to match strsignal in some OS */
#endif
#ifndef os_unsetenv
-extern int os_unsetenv(const char *);
+extern int os_unsetenv(const
us
char *);
#endif
#ifndef os_getcwd
#endif
#ifndef os_getcwd
-extern
char* os_getcwd(
char *, size_t);
+extern
uschar *os_getcwd(us
char *, size_t);
#endif
/* End of osfunctions.h */
#endif
/* End of osfunctions.h */
diff --git
a/src/src/tls.c
b/src/src/tls.c
index be9377665f0f46d118528b1fdb19e69f1b3ed4de..55295108c1315038968945d09e6a2c871f8b82d2 100644
(file)
--- a/
src/src/tls.c
+++ b/
src/src/tls.c
@@
-99,7
+99,7
@@
restore_tz(uschar * tz)
if (tz)
(void) setenv("TZ", CCS tz, 1);
else
if (tz)
(void) setenv("TZ", CCS tz, 1);
else
- (void) os_unsetenv("TZ");
+ (void) os_unsetenv(
US
"TZ");
tzset();
}
tzset();
}
diff --git
a/src/src/transports/smtp.c
b/src/src/transports/smtp.c
index 6741c01a6063c25c6af63f2173a5d9a20084e4da..a8a78d94546211a70f2a4c4445bff31ca2747bb4 100644
(file)
--- a/
src/src/transports/smtp.c
+++ b/
src/src/transports/smtp.c
@@
-3975,19
+3975,19
@@
for (addr = addrlist; addr != NULL; addr = addr->next)
}
else
{
}
else
{
- const
us
char * s;
+ const char * s;
if (hosts_retry == hosts_total)
if (hosts_retry == hosts_total)
- s =
US
"retry time not reached for any host%s";
+ s = "retry time not reached for any host%s";
else if (hosts_fail == hosts_total)
else if (hosts_fail == hosts_total)
- s =
US
"all host address lookups%s failed permanently";
+ s = "all host address lookups%s failed permanently";
else if (hosts_defer == hosts_total)
else if (hosts_defer == hosts_total)
- s =
US
"all host address lookups%s failed temporarily";
+ s = "all host address lookups%s failed temporarily";
else if (hosts_serial == hosts_total)
else if (hosts_serial == hosts_total)
- s =
US
"connection limit reached for all hosts%s";
+ s = "connection limit reached for all hosts%s";
else if (hosts_fail+hosts_defer == hosts_total)
else if (hosts_fail+hosts_defer == hosts_total)
- s =
US
"all host address lookups%s failed";
+ s = "all host address lookups%s failed";
else
else
- s =
US
"some host address lookups failed and retry time "
+ s = "some host address lookups failed and retry time "
"not reached for other hosts or connection limit reached%s";
addr->message = string_sprintf(s,
"not reached for other hosts or connection limit reached%s";
addr->message = string_sprintf(s,