From b3756e27b1e5022b680949631730b45977ac11df Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Thu, 17 Jun 2010 22:58:27 +0100 Subject: [PATCH] Eject a bunch of never-read variables, to reduce noise in scanned builds. Organization: Straylight/Edgeware From: Richard Kettlewell --- lib/configuration.c | 4 +--- lib/mime.c | 4 ++-- lib/sendmail.c | 14 +++++++------- lib/trackdb.c | 16 +++++++--------- server/rescan.c | 2 +- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/lib/configuration.c b/lib/configuration.c index 0b173d4..88cfbf2 100644 --- a/lib/configuration.c +++ b/lib/configuration.c @@ -835,9 +835,7 @@ static int validate_positive(const struct config_state *cs, static int validate_isauser(const struct config_state *cs, int attribute((unused)) nvec, char **vec) { - struct passwd *pw; - - if(!(pw = getpwnam(vec[0]))) { + if(!getpwnam(vec[0])) { disorder_error(0, "%s:%d: no such user as '%s'", cs->path, cs->line, vec[0]); return -1; } diff --git a/lib/mime.c b/lib/mime.c index 9cc54d6..48354b3 100644 --- a/lib/mime.c +++ b/lib/mime.c @@ -110,7 +110,7 @@ static const char *skipwhite(const char *s, int rfc822_comments) { int c, depth; for(;;) { - switch(c = *s) { + switch(*s) { case ' ': case '\t': case '\r': @@ -402,7 +402,7 @@ int mime_multipart(const char *s, * @param s Start of field * @param dispositionp Where to store disposition * @param parameternamep Where to store parameter name - * @param parametervaluep Wher to store parameter value + * @param parametervaluep Where to store parameter value * @return 0 on success, non-0 on error * * See RFC 2388 s3 diff --git a/lib/sendmail.c b/lib/sendmail.c index 524f68d..0c5f4db 100644 --- a/lib/sendmail.c +++ b/lib/sendmail.c @@ -118,7 +118,7 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out, const char *encoding, const char *content_type, const char *body) { - int rc, sol = 1; + int sol = 1; const char *ptr; uint8_t idbuf[20]; char *id; @@ -131,23 +131,23 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out, strftime(date, sizeof date, "%a, %d %b %Y %H:%M:%S +0000", &ut); gcry_create_nonce(idbuf, sizeof idbuf); id = mime_to_base64(idbuf, sizeof idbuf); - if((rc = getresponse(tag, in)) / 100 != 2) + if(getresponse(tag, in) / 100 != 2) return -1; if(sendcommand(tag, out, "HELO %s", local_hostname())) return -1; - if((rc = getresponse(tag, in)) / 100 != 2) + if(getresponse(tag, in) / 100 != 2) return -1; if(sendcommand(tag, out, "MAIL FROM:<%s>", sender)) return -1; - if((rc = getresponse(tag, in)) / 100 != 2) + if(getresponse(tag, in) / 100 != 2) return -1; if(sendcommand(tag, out, "RCPT TO:<%s>", recipient)) return -1; - if((rc = getresponse(tag, in)) / 100 != 2) + if(getresponse(tag, in) / 100 != 2) return -1; if(sendcommand(tag, out, "DATA", sender)) return -1; - if((rc = getresponse(tag, in)) / 100 != 3) + if(getresponse(tag, in) / 100 != 3) return -1; if(fprintf(out, "From: %s\r\n", pubsender) < 0 || fprintf(out, "To: %s\r\n", recipient) < 0 @@ -181,7 +181,7 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out, if(fprintf(out, ".\r\n") < 0 || fflush(out) < 0) goto write_error; - if((rc = getresponse(tag, in)) / 100 != 2) + if(getresponse(tag, in) / 100 != 2) return -1; return 0; } diff --git a/lib/trackdb.c b/lib/trackdb.c index 24d04ac..da5685a 100644 --- a/lib/trackdb.c +++ b/lib/trackdb.c @@ -840,7 +840,7 @@ static char **dedupe(char **vec, int nvec) { int m, n; qsort(vec, nvec, sizeof (char *), wordcmp); - m = n = 0; + m = 0; if(nvec) { vec[m++] = vec[0]; for(n = 1; n < nvec; ++n) @@ -1823,7 +1823,7 @@ int trackdb_set(const char *track, if(trackdb_putdata(trackdb_prefsdb, track, p, tid, 0)) goto fail; /* compute the new alias name */ - if((err = compute_alias(&newalias, track, p, tid))) goto fail; + if(compute_alias(&newalias, track, p, tid)) goto fail; /* check whether alias has changed */ if(!(oldalias == newalias || (oldalias && newalias && !strcmp(oldalias, newalias)))) { @@ -2176,13 +2176,13 @@ const char *trackdb_getpart(const char *track, DB_TXN *tid; char *pref; const char *actual; - int used_db, err; + int used_db; /* construct the full pref */ byte_xasprintf(&pref, "trackname_%s_%s", context, part); for(;;) { tid = trackdb_begin_transaction(); - if((err = gettrackdata(track, 0, &p, &actual, 0, tid)) == DB_LOCK_DEADLOCK) + if(gettrackdata(track, 0, &p, &actual, 0, tid) == DB_LOCK_DEADLOCK) goto fail; break; fail: @@ -2741,12 +2741,11 @@ void trackdb_set_global(const char *name, const char *value, const char *who) { DB_TXN *tid; - int err; int state; for(;;) { tid = trackdb_begin_transaction(); - if(!(err = trackdb_set_global_tid(name, value, tid))) + if(!trackdb_set_global_tid(name, value, tid)) break; trackdb_abort_transaction(tid); } @@ -2803,12 +2802,11 @@ int trackdb_set_global_tid(const char *name, */ const char *trackdb_get_global(const char *name) { DB_TXN *tid; - int err; const char *r; for(;;) { tid = trackdb_begin_transaction(); - if(!(err = trackdb_get_global_tid(name, tid, &r))) + if(!trackdb_get_global_tid(name, tid, &r)) break; trackdb_abort_transaction(tid); } @@ -2912,7 +2910,7 @@ static char **trackdb_new_tid(int *ntracksp, default: disorder_fatal(0, "error reading noticed.db: %s", db_strerror(err)); } - if((err = trackdb_closecursor(c))) + if(trackdb_closecursor(c)) return 0; /* deadlock */ vector_terminate(tracks); if(ntracksp) diff --git a/server/rescan.c b/server/rescan.c index bc99681..7cb24b6 100644 --- a/server/rescan.c +++ b/server/rescan.c @@ -160,7 +160,7 @@ done: if(fp) xfclose(fp); if(pid) - while((r = waitpid(pid, &w, 0)) == -1 && errno == EINTR) + while((waitpid(pid, &w, 0)) == -1 && errno == EINTR) ; } -- [mdw]