ph10 2005/06/22 16:44:38 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src bmi_spam.c daemon.c dbfn.c deliver.c
directory.c exim_dbutil.c exim_lock.c
expand.c host.c log.c receive.c spam.c
spool_in.c spool_out.c transport.c
exim-src/src/transports appendfile.c
Log:
Insert a lot of missing (void) casts.
Revision Changes Path
1.169 +6 -0 exim/exim-doc/doc-txt/ChangeLog
1.4 +1 -1 exim/exim-src/src/bmi_spam.c
1.12 +3 -3 exim/exim-src/src/daemon.c
1.5 +1 -1 exim/exim-src/src/dbfn.c
1.19 +9 -9 exim/exim-src/src/deliver.c
1.3 +2 -2 exim/exim-src/src/directory.c
1.6 +2 -2 exim/exim-src/src/exim_dbutil.c
1.2 +3 -3 exim/exim-src/src/exim_lock.c
1.35 +2 -2 exim/exim-src/src/expand.c
1.10 +3 -3 exim/exim-src/src/host.c
1.4 +2 -2 exim/exim-src/src/log.c
1.19 +2 -2 exim/exim-src/src/receive.c
1.8 +1 -1 exim/exim-src/src/spam.c
1.11 +7 -7 exim/exim-src/src/spool_in.c
1.7 +2 -2 exim/exim-src/src/spool_out.c
1.11 +2 -2 exim/exim-src/src/transport.c
1.9 +12 -12 exim/exim-src/src/transports/appendfile.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- ChangeLog 22 Jun 2005 14:45:05 -0000 1.168
+++ ChangeLog 22 Jun 2005 15:44:37 -0000 1.169
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.168 2005/06/22 14:45:05 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.169 2005/06/22 15:44:37 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -180,6 +180,12 @@
databases so that it will be absolutely obvious if a crash occurs in the
DB library. This is a regular occurrence (often caused by mis-matched
db.h files).
+
+PH/26 Insert a lot of missing (void) casts for functions such as chown(),
+ chmod(), fcntl(), and sscanf(). These were picked up on a user's system
+ that detects such things. There doesn't seem to be a gcc warning option
+ for this - only an attribute that has to be put on the function's
+ prototype. I'm sure I haven't caught all of these, but it's a start.
Exim version 4.51
Index: bmi_spam.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/bmi_spam.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bmi_spam.c 17 Feb 2005 11:58:25 -0000 1.3
+++ bmi_spam.c 22 Jun 2005 15:44:37 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/bmi_spam.c,v 1.3 2005/02/17 11:58:25 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/bmi_spam.c,v 1.4 2005/06/22 15:44:37 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -453,7 +453,7 @@
int rule_int = -1;
/* try to translate to int */
- sscanf(rule_num, "%d", &rule_int);
+ (void)sscanf(rule_num, "%d", &rule_int);
if (rule_int > 0) {
debug_printf("checking rule #%d\n", rule_int);
/* check if rule fired on the message */
Index: daemon.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/daemon.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- daemon.c 21 Jun 2005 14:14:55 -0000 1.11
+++ daemon.c 22 Jun 2005 15:44:37 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/daemon.c,v 1.11 2005/06/21 14:14:55 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/daemon.c,v 1.12 2005/06/22 15:44:37 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1417,9 +1417,9 @@
f = Ufopen(pid_file_path, "wb");
if (f != NULL)
{
- fprintf(f, "%d\n", (int)getpid());
- fchmod(fileno(f), 0644);
- fclose(f);
+ (void)fprintf(f, "%d\n", (int)getpid());
+ (void)fchmod(fileno(f), 0644);
+ (void)fclose(f);
DEBUG(D_any) debug_printf("pid written to %s\n", pid_file_path);
}
else
Index: dbfn.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/dbfn.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbfn.c 22 Jun 2005 14:45:05 -0000 1.4
+++ dbfn.c 22 Jun 2005 15:44:37 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/dbfn.c,v 1.4 2005/06/22 14:45:05 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/dbfn.c,v 1.5 2005/06/22 15:44:37 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -206,7 +206,7 @@
if (Ustat(buffer, &statbuf) >= 0 && statbuf.st_uid != exim_uid)
{
DEBUG(D_hints_lookup) debug_printf("ensuring %s is owned by exim\n", buffer);
- Uchown(buffer, exim_uid, exim_gid);
+ (void)Uchown(buffer, exim_uid, exim_gid);
}
}
}
Index: deliver.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/deliver.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- deliver.c 16 Jun 2005 14:10:13 -0000 1.18
+++ deliver.c 22 Jun 2005 15:44:37 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/deliver.c,v 1.18 2005/06/16 14:10:13 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/deliver.c,v 1.19 2005/06/22 15:44:37 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -286,7 +286,7 @@
if (fd >= 0)
{
- fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+ (void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
if (fchown(fd, exim_uid, exim_gid) < 0)
{
*error = US"chown";
@@ -1729,7 +1729,7 @@
gid/uid. */
close(pfd[pipe_read]);
- fcntl(pfd[pipe_write], F_SETFD, fcntl(pfd[pipe_write], F_GETFD) |
+ (void)fcntl(pfd[pipe_write], F_SETFD, fcntl(pfd[pipe_write], F_GETFD) |
FD_CLOEXEC);
exim_setugid(uid, gid, use_initgroups,
string_sprintf("local delivery to %s <%s> transport=%s", addr->local_part,
@@ -3673,9 +3673,9 @@
distinguishes between EOF and no-more-data. */
#ifdef O_NONBLOCK
- fcntl(pfd[pipe_read], F_SETFL, O_NONBLOCK);
+ (void)fcntl(pfd[pipe_read], F_SETFL, O_NONBLOCK);
#else
- fcntl(pfd[pipe_read], F_SETFL, O_NDELAY);
+ (void)fcntl(pfd[pipe_read], F_SETFL, O_NDELAY);
#endif
/* If the maximum number of subprocesses already exist, wait for a process
@@ -3748,7 +3748,7 @@
a new process that may be forked to do another delivery down the same
SMTP connection. */
- fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+ (void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
/* Close open file descriptors for the pipes of other processes
that are running in parallel. */
@@ -3775,7 +3775,7 @@
/* Set the close-on-exec flag */
- fcntl(deliver_datafile, F_SETFD, fcntl(deliver_datafile, F_GETFD) |
+ (void)fcntl(deliver_datafile, F_SETFD, fcntl(deliver_datafile, F_GETFD) |
FD_CLOEXEC);
/* Set the uid/gid of this process; bombs out on failure. */
@@ -5845,9 +5845,9 @@
that the mode is correct - the group setting doesn't always seem to get
set automatically. */
- fcntl(journal_fd, F_SETFD, fcntl(journal_fd, F_GETFD) | FD_CLOEXEC);
- fchown(journal_fd, exim_uid, exim_gid);
- fchmod(journal_fd, SPOOL_MODE);
+ (void)fcntl(journal_fd, F_SETFD, fcntl(journal_fd, F_GETFD) | FD_CLOEXEC);
+ (void)fchown(journal_fd, exim_uid, exim_gid);
+ (void)fchmod(journal_fd, SPOOL_MODE);
}
Index: directory.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/directory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- directory.c 4 Jan 2005 10:00:42 -0000 1.2
+++ directory.c 22 Jun 2005 15:44:38 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/directory.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/directory.c,v 1.3 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -74,13 +74,13 @@
/* Set the ownership if necessary. */
- if (use_chown) Uchown(buffer, exim_uid, exim_gid);
+ if (use_chown) (void)Uchown(buffer, exim_uid, exim_gid);
/* It appears that any mode bits greater than 0777 are ignored by
mkdir(), at least on some operating systems. Therefore, if the mode
contains any such bits, do an explicit mode setting. */
- if ((mode & 0777000) != 0) Uchmod(buffer, mode);
+ if ((mode & 0777000) != 0) (void)Uchmod(buffer, mode);
}
*p++ = c;
}
Index: exim_dbutil.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim_dbutil.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- exim_dbutil.c 14 Jun 2005 10:32:01 -0000 1.5
+++ exim_dbutil.c 22 Jun 2005 15:44:38 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim_dbutil.c,v 1.5 2005/06/14 10:32:01 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/exim_dbutil.c,v 1.6 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -775,12 +775,12 @@
printf("No previous record name is set\n");
continue;
}
- sscanf(CS buffer, "%s %s", field, value);
+ (void)sscanf(CS buffer, "%s %s", field, value);
}
else
{
name[0] = 0;
- sscanf(CS buffer, "%s %s %s", name, field, value);
+ (void)sscanf(CS buffer, "%s %s %s", name, field, value);
}
/* Handle an update request */
Index: exim_lock.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim_lock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exim_lock.c 7 Oct 2004 10:39:01 -0000 1.1
+++ exim_lock.c 22 Jun 2005 15:44:38 -0000 1.2
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim_lock.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/exim_lock.c,v 1.2 2005/06/22 15:44:38 ph10 Exp $ */
/* A program to lock a file exactly as Exim would, for investigation of
interlocking problems.
@@ -439,7 +439,7 @@
goto CLEAN_UP;
}
- chmod (tempname, 0600);
+ (void)chmod(tempname, 0600);
if (apply_lock(md, F_WRLCK, use_fcntl, lock_fcntl_timeout, use_flock,
lock_flock_timeout) >= 0)
@@ -551,12 +551,12 @@
struct stat strestore;
struct utimbuf ut;
stat(filename, &strestore);
- system(command);
+ (void)system(command);
ut.actime = strestore.st_atime;
ut.modtime = strestore.st_mtime;
utime(filename, &ut);
}
-else system(command);
+else (void)system(command);
/* Remove the locks and exit. Unlink the /tmp file if we can get an exclusive
lock on the mailbox. This should be a non-blocking lock call, as there is no
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- expand.c 22 Jun 2005 10:17:23 -0000 1.34
+++ expand.c 22 Jun 2005 15:44:38 -0000 1.35
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.34 2005/06/22 10:17:23 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.35 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3438,8 +3438,8 @@
uschar *now = prvs_daystamp(0);
unsigned int inow = 0,iexpire = 1;
- sscanf(CS now,"%u",&inow);
- sscanf(CS daystamp,"%u",&iexpire);
+ (void)sscanf(CS now,"%u",&inow);
+ (void)sscanf(CS daystamp,"%u",&iexpire);
/* When "iexpire" is < 7, a "flip" has occured.
Adjust "inow" accordingly. */
Index: host.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/host.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- host.c 17 Feb 2005 11:58:26 -0000 1.9
+++ host.c 22 Jun 2005 15:44:38 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/host.c,v 1.9 2005/02/17 11:58:26 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/host.c,v 1.10 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -809,7 +809,7 @@
/* Handle IPv4 address */
-sscanf(CS address, "%d.%d.%d.%d", x, x+1, x+2, x+3);
+(void)sscanf(CS address, "%d.%d.%d.%d", x, x+1, x+2, x+3);
bin[v4offset] = (x[0] << 24) + (x[1] << 16) + (x[2] << 8) + x[3];
return v4offset+1;
}
@@ -2969,12 +2969,12 @@
else if (Ustrcmp(buffer, "no_search_parents") == 0) search_parents = FALSE;
else if (Ustrncmp(buffer, "retrans", 7) == 0)
{
- sscanf(CS(buffer+8), "%d", &dns_retrans);
+ (void)sscanf(CS(buffer+8), "%d", &dns_retrans);
_res.retrans = dns_retrans;
}
else if (Ustrncmp(buffer, "retry", 5) == 0)
{
- sscanf(CS(buffer+6), "%d", &dns_retry);
+ (void)sscanf(CS(buffer+6), "%d", &dns_retry);
_res.retry = dns_retry;
}
else if (alldigits(buffer))
Index: log.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/log.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- log.c 29 Mar 2005 15:19:25 -0000 1.3
+++ log.c 22 Jun 2005 15:44:38 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/log.c,v 1.3 2005/03/29 15:19:25 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/log.c,v 1.4 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -314,7 +314,7 @@
if (*fd >= 0)
{
- fcntl(*fd, F_SETFD, fcntl(*fd, F_GETFD) | FD_CLOEXEC);
+ (void)fcntl(*fd, F_SETFD, fcntl(*fd, F_GETFD) | FD_CLOEXEC);
return;
}
@@ -367,7 +367,7 @@
if (*fd >= 0)
{
- fcntl(*fd, F_SETFD, fcntl(*fd, F_GETFD) | FD_CLOEXEC);
+ (void)fcntl(*fd, F_SETFD, fcntl(*fd, F_GETFD) | FD_CLOEXEC);
return;
}
Index: receive.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/receive.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- receive.c 23 May 2005 15:28:38 -0000 1.18
+++ receive.c 22 Jun 2005 15:44:38 -0000 1.19
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/receive.c,v 1.18 2005/05/23 15:28:38 fanf2 Exp $ */
+/* $Cambridge: exim/exim-src/src/receive.c,v 1.19 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2602,8 +2602,8 @@
/* Make sure the file's group is the Exim gid, and double-check the mode
because the group setting doesn't always get set automatically. */
-fchown(data_fd, exim_uid, exim_gid);
-fchmod(data_fd, SPOOL_MODE);
+(void)fchown(data_fd, exim_uid, exim_gid);
+(void)fchmod(data_fd, SPOOL_MODE);
/* We now have data file open. Build a stream for it and lock it. We lock only
the first line of the file (containing the message ID) because otherwise there
Index: spam.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spam.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- spam.c 10 Jun 2005 13:29:36 -0000 1.7
+++ spam.c 22 Jun 2005 15:44:38 -0000 1.8
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spam.c,v 1.7 2005/06/10 13:29:36 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/spam.c,v 1.8 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -221,7 +221,7 @@
pollfd.fd = spamd_sock;
pollfd.events = POLLOUT;
#endif
- fcntl(spamd_sock, F_SETFL, O_NONBLOCK);
+ (void)fcntl(spamd_sock, F_SETFL, O_NONBLOCK);
do {
read = fread(spamd_buffer,1,sizeof(spamd_buffer),mbox_file);
if (read > 0) {
Index: spool_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spool_in.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- spool_in.c 7 Apr 2005 10:10:01 -0000 1.10
+++ spool_in.c 22 Jun 2005 15:44:38 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.10 2005/04/07 10:10:01 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.11 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -76,7 +76,7 @@
Unix systems it doesn't make any difference as long as Exim is consistent in
what it locks. */
-fcntl(deliver_datafile, F_SETFD, fcntl(deliver_datafile, F_GETFD) |
+(void)fcntl(deliver_datafile, F_SETFD, fcntl(deliver_datafile, F_GETFD) |
FD_CLOEXEC);
lock_data.l_type = F_WRLCK;
@@ -581,7 +581,7 @@
if (*p == ' ')
{
*p++ = 0;
- sscanf(CS p, "%d,%d", &dummy, &pno);
+ (void)sscanf(CS p, "%d,%d", &dummy, &pno);
}
}
@@ -590,7 +590,7 @@
else if (*p == ' ')
{
*p++ = 0;
- sscanf(CS p, "%d", &pno);
+ (void)sscanf(CS p, "%d", &pno);
}
/* Handle current format Exim 4 spool files */
@@ -598,13 +598,13 @@
else if (*p == '#')
{
int flags;
- sscanf(CS p+1, "%d", &flags);
+ (void)sscanf(CS p+1, "%d", &flags);
if ((flags & 0x01) != 0) /* one_time data exists */
{
int len;
while (isdigit(*(--p)) || *p == ',' || *p == '-');
- sscanf(CS p+1, "%d,%d", &len, &pno);
+ (void)sscanf(CS p+1, "%d,%d", &len, &pno);
*p = 0;
if (len > 0)
{
@@ -640,8 +640,8 @@
int i;
if (!isdigit(n)) goto SPOOL_FORMAT_ERROR;
- ungetc(n, f);
- fscanf(f, "%d%c ", &n, flag);
+ (void)ungetc(n, f);
+ (void)fscanf(f, "%d%c ", &n, flag);
if (flag[0] != '*') message_size += n; /* Omit non-transmitted headers */
if (read_headers)
Index: spool_out.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spool_out.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- spool_out.c 17 Feb 2005 11:58:26 -0000 1.6
+++ spool_out.c 22 Jun 2005 15:44:38 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.6 2005/02/17 11:58:26 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/spool_out.c,v 1.7 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -96,8 +96,8 @@
if (fd >= 0)
{
- fchown(fd, exim_uid, exim_gid);
- fchmod(fd, SPOOL_MODE);
+ (void)fchown(fd, exim_uid, exim_gid);
+ (void)fchmod(fd, SPOOL_MODE);
}
return fd;
Index: transport.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transport.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- transport.c 20 Jun 2005 11:20:41 -0000 1.10
+++ transport.c 22 Jun 2005 15:44:38 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transport.c,v 1.10 2005/06/20 11:20:41 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transport.c,v 1.11 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1164,10 +1164,10 @@
yield = FALSE;
write_pid = (pid_t)(-1);
-fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+(void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
filter_pid = child_open(transport_filter_argv, NULL, 077, &fd_write, &fd_read,
FALSE);
-fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) & ~FD_CLOEXEC);
+(void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) & ~FD_CLOEXEC);
if (filter_pid < 0) goto TIDY_UP; /* errno set */
DEBUG(D_transport)
Index: appendfile.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/appendfile.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- appendfile.c 16 Jun 2005 14:10:14 -0000 1.8
+++ appendfile.c 22 Jun 2005 15:44:38 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/appendfile.c,v 1.8 2005/06/16 14:10:14 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/appendfile.c,v 1.9 2005/06/22 15:44:38 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1734,8 +1734,8 @@
/* We have successfully created and opened the file. Ensure that the group
and the mode are correct. */
- Uchown(filename, uid, gid);
- Uchmod(filename, mode);
+ (void)Uchown(filename, uid, gid);
+ (void)Uchmod(filename, mode);
}
@@ -2002,7 +2002,7 @@
goto RETURN;
}
- Uchmod(mbx_lockname, 0600);
+ (void)Uchmod(mbx_lockname, 0600);
if (apply_lock(mbx_lockfd, F_WRLCK, ob->use_fcntl,
ob->lock_fcntl_timeout, ob->use_flock, ob->lock_flock_timeout) >= 0)
@@ -2415,8 +2415,8 @@
/* Why are these here? Put in because they are present in the non-maildir
directory case above. */
- Uchown(filename, uid, gid);
- Uchmod(filename, mode);
+ (void)Uchown(filename, uid, gid);
+ (void)Uchmod(filename, mode);
}
#endif /* SUPPORT_MAILDIR */
@@ -2457,8 +2457,8 @@
/* Why are these here? Put in because they are present in the non-maildir
directory case above. */
- Uchown(filename, uid, gid);
- Uchmod(filename, mode);
+ (void)Uchown(filename, uid, gid);
+ (void)Uchmod(filename, mode);
/* Built a C stream from the open file descriptor. */
@@ -2549,8 +2549,8 @@
Uunlink(filename);
return FALSE;
}
- Uchown(dataname, uid, gid);
- Uchmod(dataname, mode);
+ (void)Uchown(dataname, uid, gid);
+ (void)Uchmod(dataname, mode);
}
#endif /* SUPPORT_MAILSTORE */
@@ -2559,8 +2559,8 @@
/* In all cases of writing to a new file, ensure that the file which is
going to be renamed has the correct ownership and mode. */
- Uchown(filename, uid, gid);
- Uchmod(filename, mode);
+ (void)Uchown(filename, uid, gid);
+ (void)Uchmod(filename, mode);
}
@@ -2919,7 +2919,7 @@
investigated so far have ftruncate(), whereas not all have the F_FREESP
fcntl() call (BSDI & FreeBSD do not). */
- if (!isdirectory) ftruncate(fd, saved_size);
+ if (!isdirectory) (void)ftruncate(fd, saved_size);
}
/* Handle successful writing - we want the modification time to be now for
