diff options
| author |   Charles Longeau <github@chl.be> | 2012-11-15 22:06:50 +0100 |
|---|---|---|
| committer | Charles Longeau <github@chl.be> | 2012-11-15 22:06:50 +0100 |
| commit | 3ef4f4ce6d634d598a8bb54d1d3ae6b68ad5a89a (patch) | |
| tree | f5903ac539b1f2ca9dbf638cb5d9914c0b1a4410 /smtpd/delivery_filename.c | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | Merge branch 'cleanup' (diff) | |
| download | OpenSMTPD-3ef4f4ce6d634d598a8bb54d1d3ae6b68ad5a89a.tar.xz OpenSMTPD-3ef4f4ce6d634d598a8bb54d1d3ae6b68ad5a89a.zip | |
fix merge master conflicts
Diffstat (limited to 'smtpd/delivery_filename.c')
| -rw-r--r-- | smtpd/delivery_filename.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/smtpd/delivery_filename.c b/smtpd/delivery_filename.c index 52238ade..750fd4bf 100644 --- a/smtpd/delivery_filename.c +++ b/smtpd/delivery_filename.c @@ -57,7 +57,7 @@ struct delivery_backend delivery_backend_filename = { static void delivery_filename_open(struct deliver *deliver) { - struct stat sb; + struct stat sb; time_t now; size_t len; int fd; @@ -66,7 +66,7 @@ delivery_filename_open(struct deliver *deliver) char *msg; int n; -#define error(m) { msg = m; goto err; } +#define error(m) { msg = m; goto err; } #define error2(m) { msg = m; goto err2; } setproctitle("file delivery"); |