diff options
author | Eric Wong <normalperson@yhbt.net> | 2013-02-07 09:30:17 +0000 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2013-02-07 09:59:30 +0000 |
commit | 5b7d2608f95332c3bcd69d1eb56044236fc6b978 (patch) | |
tree | 8260d11df1d15bc6dab0fbc5fdbe61cc124732ab | |
parent | 9510a1d244e22725e2710d04571e3d6fbf89b0e8 (diff) | |
download | cmogstored-5b7d2608f95332c3bcd69d1eb56044236fc6b978.tar.gz |
The GNU error() function already emits a newline at the end of these messages.
-rw-r--r-- | cfg.c | 4 | ||||
-rw-r--r-- | cfg_parser.rl | 2 | ||||
-rw-r--r-- | cfg_validate.c | 12 | ||||
-rw-r--r-- | cloexec_detect.c | 2 | ||||
-rw-r--r-- | maxconns.c | 10 | ||||
-rw-r--r-- | mgmt_fn.c | 6 |
6 files changed, 18 insertions, 18 deletions
@@ -91,7 +91,7 @@ int mog_cfg_load(struct mog_cfg *cfg) errno = 0; r = read(fd, buf, sb.st_size); if (r != sb.st_size) - die("read(..., %ld) failed on %s: %s\n", + die("read(..., %ld) failed on %s: %s", (long)sb.st_size, cfg->configfile, errno ? strerror(errno) : "EOF"); @@ -154,7 +154,7 @@ static bool svc_from_cfg(void *cfg_ptr, void *ignored) assert(cfg->docroot && "no docroot specified"); svc = mog_svc_new(cfg->docroot); if (!svc) - die("failed to load svc from docroot=%s\n", cfg->docroot); + die("failed to load svc from docroot=%s", cfg->docroot); svc->mgmt_fd = bind_or_die(cfg->mgmtlisten, "dataready"); diff --git a/cfg_parser.rl b/cfg_parser.rl index 0c495f7..8f99977 100644 --- a/cfg_parser.rl +++ b/cfg_parser.rl @@ -89,7 +89,7 @@ static char *mystrdup(const char *key, char *mark_beg, const char *p) (comment* eor) > { char *tmp = mystrdup("serverbin", mark_beg, fpc); if (!tmp) return -1; - warn("W: serverbin = %s ignored\n", tmp); + warn("W: serverbin = %s ignored", tmp); free(tmp); }; main := (mgmtlisten | httplisten | httpgetlisten | diff --git a/cfg_validate.c b/cfg_validate.c index 27e1778..d07b96c 100644 --- a/cfg_validate.c +++ b/cfg_validate.c @@ -19,7 +19,7 @@ paths_eql_or_die( if (ok) return; - die("conflicting path values for %s: `%s' != `%s'\n", + die("conflicting path values for %s: `%s' != `%s'", param, a_orig, b_orig); } @@ -76,9 +76,9 @@ bool mog_cfg_validate_multi(void *ent_ptr, void *cli_ptr) if (!ent->configfile) die("BUG: no config path"); if (!ent->httplisten && !ent->mgmtlisten && !ent->httpgetlisten) - die("no listeners in --config=%s\n", ent->configfile); + die("no listeners in --config=%s", ent->configfile); if (!ent->docroot) - die("no docroot in --config=%s\n", ent->configfile); + die("no docroot in --config=%s", ent->configfile); validate_merge_common(ent, cli); @@ -88,7 +88,7 @@ bool mog_cfg_validate_multi(void *ent_ptr, void *cli_ptr) static void die_if_set(const void *a, const char *sw) { if (!a) return; - die("--%s may not be used with multiple --config files\n", sw); + die("--%s may not be used with multiple --config files", sw); } /* @@ -125,7 +125,7 @@ void mog_cfg_check_server(struct mog_cfg *cfg) if (strcmp(s, "none") == 0) return; if (strcmp(s, "perlbal") == 0) - warn("W: using internal HTTP for 'server = perlbal' instead\n"); + warn("W: using internal HTTP for 'server = perlbal' instead"); else - die("E: 'server = %s' not understood by cmogstored\n", s); + die("E: 'server = %s' not understood by cmogstored", s); } diff --git a/cloexec_detect.c b/cloexec_detect.c index 1bd84f0..1e80244 100644 --- a/cloexec_detect.c +++ b/cloexec_detect.c @@ -43,6 +43,6 @@ out: if (mog_cloexec_atomic) mog_cloexec_works(); else - warn("close-on-exec is NOT atomic\n"); + warn("close-on-exec is NOT atomic"); } #endif /* no O_CLOEXEC at all */ @@ -34,10 +34,10 @@ void mog_set_maxconns(unsigned long maxconns) /* insane? maybe... */ r.rlim_max = r.rlim_cur = want; } else if (r.rlim_max == 0) { - warn("RLIMIT_NOFILE max=0, trying %ld anyways\n", (long)want); + warn("RLIMIT_NOFILE max=0, trying %ld anyways", (long)want); r.rlim_max = r.rlim_cur = want; } else if (r.rlim_max < want) { - warn("RLIMIT_NOFILE max=%ld less than wanted value=%ld\n", + warn("RLIMIT_NOFILE max=%ld less than wanted value=%ld", (long)r.rlim_max, (long)want); r.rlim_cur = r.rlim_max; } else { @@ -46,7 +46,7 @@ void mog_set_maxconns(unsigned long maxconns) if (setrlimit(RLIMIT_NOFILE, &r) == 0) return; - warn("failed to set RLIMIT_NOFILE max=%ld cur=%ld (maxconns=%lu)\n", + warn("failed to set RLIMIT_NOFILE max=%ld cur=%ld (maxconns=%lu)", (long)r.rlim_max, (long)r.rlim_cur, maxconns); while ((want -= 64) >= maxconns) { @@ -55,11 +55,11 @@ void mog_set_maxconns(unsigned long maxconns) goto eventual_success; } - warn("RLIMIT_NOFILE stuck at max=%ld cur=%ld (maxconns=%lu)\n", + warn("RLIMIT_NOFILE stuck at max=%ld cur=%ld (maxconns=%lu)", (long)orig.rlim_max, (long)orig.rlim_cur, maxconns); return; eventual_success: - warn("set RLIMIT_NOFILE max=%ld cur=%ld (maxconns=%lu)\n", + warn("set RLIMIT_NOFILE max=%ld cur=%ld (maxconns=%lu)", (long)r.rlim_max, (long)r.rlim_cur, maxconns); } @@ -59,8 +59,8 @@ void mog_mgmt_fn_digest(struct mog_mgmt *mgmt, char *buf) case GC_SHA1: IOV_STR(&iov[1], " SHA-1=-1\r\n"); break; - default: - die("BUG: unhandled algorithm: %d\n", mgmt->alg); + default: /* Ragel parser prevents this: */ + die("BUG: unhandled algorithm: %d", mgmt->alg); } mog_mgmt_writev(mgmt, iov, 2); free(path); @@ -115,7 +115,7 @@ void mog_mgmt_fn_digest_emit(struct mog_mgmt *mgmt) iov[1].iov_len = sizeof(buf); break; default: - die("BUG: unhandled algorithm: %d\n", mgmt->alg); + die("BUG: unhandled algorithm: %d", mgmt->alg); } mog_digest_hex(&file->digest, b, len); |