Skip to content

Commit

Permalink
Fix "format not a string literal" warning
Browse files Browse the repository at this point in the history
Under Ubuntu 10.04 the default compiler flags include -Wformat
and -Wformat-security which cause the above warning.  In particular,
cases where "%s" was forgotten as part of the format specifier.

https://wiki.ubuntu.com/CompilerFlags
  • Loading branch information
behlendorf committed Sep 9, 2010
1 parent 6283f55 commit 8ec8000
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/libnvpair/libnvpair.c
Expand Up @@ -123,7 +123,7 @@ struct nvlist_prtctl {
(void) DFLTPRTOP(pctl, type)(pctl, \
DFLTPRTOPARG(pctl, type), nvl, name, val); \
} \
(void) fprintf(pctl->nvprt_fp, pctl->nvprt_eomfmt); \
(void) fprintf(pctl->nvprt_fp, "%s", pctl->nvprt_eomfmt); \
}

#define ARENDER(pctl, type, nvl, name, arrp, count) \
Expand All @@ -137,7 +137,7 @@ struct nvlist_prtctl {
(void) DFLTPRTOP(pctl, type)(pctl, \
DFLTPRTOPARG(pctl, type), nvl, name, arrp, count); \
} \
(void) fprintf(pctl->nvprt_fp, pctl->nvprt_eomfmt); \
(void) fprintf(pctl->nvprt_fp, "%s", pctl->nvprt_eomfmt); \
}

static void nvlist_print_with_indent(nvlist_t *, nvlist_prtctl_t);
Expand Down Expand Up @@ -235,7 +235,7 @@ nvaprint_##type_and_variant(nvlist_prtctl_t pctl, void *private, \
(void) fprintf(fp, "[%d]: ", i); \
} \
if (i != 0) \
(void) fprintf(fp, pctl->nvprt_btwnarrfmt); \
(void) fprintf(fp, "%s", pctl->nvprt_btwnarrfmt); \
(void) fprintf(fp, vfmt, (ptype)valuep[i]); \
} \
return (1); \
Expand Down Expand Up @@ -394,11 +394,11 @@ nvlist_prtctl_dofmt(nvlist_prtctl_t pctl, enum nvlist_prtctl_fmt which, ...)
break;

case NVLIST_FMT_MEMBER_POSTAMBLE:
(void) fprintf(fp, pctl->nvprt_eomfmt);
(void) fprintf(fp, "%s", pctl->nvprt_eomfmt);
break;

case NVLIST_FMT_BTWN_ARRAY:
(void) fprintf(fp, pctl->nvprt_btwnarrfmt); \
(void) fprintf(fp, "%s", pctl->nvprt_btwnarrfmt);
break;

default:
Expand Down

0 comments on commit 8ec8000

Please sign in to comment.