diff options
| -rw-r--r-- | gacopyz/context.c | 7 | ||||
| -rw-r--r-- | lib/db.c | 5 | ||||
| -rw-r--r-- | lib/userprivs.c | 2 | ||||
| -rw-r--r-- | mtasim/mtasim.c | 1 | ||||
| -rw-r--r-- | src/calloutd.c | 2 | ||||
| -rw-r--r-- | src/savsrv.c | 1 |
6 files changed, 6 insertions, 12 deletions
diff --git a/gacopyz/context.c b/gacopyz/context.c index 27787922..147cf2b8 100644 --- a/gacopyz/context.c +++ b/gacopyz/context.c @@ -268,7 +268,7 @@ _gacopyz_setmlreply_va(SMFICTX *ctx, size_t max, const char *rcode, int gacopyz_setreply(SMFICTX *ctx, const char *rcode, const char *xcode, - const char *message) + const char *message) { if (rcode == NULL || ctx == NULL) return MI_FAILURE; @@ -294,10 +294,9 @@ gacopyz_setreply(SMFICTX *ctx, const char *rcode, const char *xcode, int gacopyz_setmlreply_va(SMFICTX *ctx, const char *rcode, const char *xcode, - va_list ap) + va_list ap) { return _gacopyz_setmlreply_va(ctx, 0, rcode, xcode, ap); - return MI_SUCCESS; } int @@ -310,6 +309,6 @@ gacopyz_setmlreply_v(SMFICTX *ctx, const char *rcode, const char *xcode, ...) rc = gacopyz_setmlreply_va(ctx, rcode, xcode, ap); va_end(ap); - return MI_SUCCESS; + return rc; } @@ -415,7 +415,6 @@ db_compact(char *dbname, db_expire_t fun) struct compact_data dat; const char *file_name; int flags, rc; - uid_t uid; int fd; struct stat st; @@ -428,11 +427,11 @@ db_compact(char *dbname, db_expire_t fun) rc = mu_dbm_get_fd(odb, &fd, NULL); if (rc) { mu_dbm_destroy(&odb); - mu_error("mu_dbm_get_fd(%s): %s", tmpname, mu_strerror (rc)); + mu_diag_funcall(MU_DIAG_ERROR, "mu_dbm_get_fd", NULL, rc); return 1; } if (fstat(fd, &st)) { - mu_error("fstat(%s): %s", tmpname, mu_strerror (errno)); + mu_diag_funcall(MU_DIAG_ERROR, "fstat", NULL, errno); mu_dbm_destroy(&odb); return 1; } diff --git a/lib/userprivs.c b/lib/userprivs.c index f8100a83..f57d5d38 100644 --- a/lib/userprivs.c +++ b/lib/userprivs.c @@ -65,7 +65,7 @@ mf_gid_list_free(struct mf_gid_list *gl) for (p = gl->head; p; ) { struct mf_gid_block *next = p->next; free(p); - p = p->next; + p = next; } } diff --git a/mtasim/mtasim.c b/mtasim/mtasim.c index 7397a1b2..de71562e 100644 --- a/mtasim/mtasim.c +++ b/mtasim/mtasim.c @@ -1839,7 +1839,6 @@ smtp_mail (struct mu_wordsplit *ws, int *state) static void smtp_rcpt (struct mu_wordsplit *ws, int *state) { - char **argv; size_t n; nrcpt++; diff --git a/src/calloutd.c b/src/calloutd.c index 17272616..56dd2a44 100644 --- a/src/calloutd.c +++ b/src/calloutd.c @@ -89,8 +89,6 @@ struct mu_cli_setup cli = { int main(int argc, char **argv) { - int rc; - mf_init_nls(); mf_proctitle_init(argc, argv, environ); mu_alloc_die_hook = callout_alloc_die; diff --git a/src/savsrv.c b/src/savsrv.c index 2736fe3f..f3953ab8 100644 --- a/src/savsrv.c +++ b/src/savsrv.c @@ -501,7 +501,6 @@ callout_session_server(const char *id, int fd, { FILE *fp = fdopen(fd, "w+"); char buf[1024]; - size_t size = 0; int longline = 0; signal(SIGPIPE, SIG_IGN); |