summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordevzero2000 <devzero2000>2014-01-08 09:38:16 +0000
committerdevzero2000 <devzero2000>2014-01-08 09:38:16 +0000
commit16bff9b54f462340f7a01efcb7ac982e6d1777a2 (patch)
tree0ba989e0e98e6ea2988eba013156a181fb91138b
parent1b103fb6979e85c8978401e199038dd5311cd4ab (diff)
downloadlibpopt-16bff9b54f462340f7a01efcb7ac982e6d1777a2.tar.gz
poptint.c reduce variables scope (cppcheck warning)
-rw-r--r--CHANGES1
-rw-r--r--poptint.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 242ee46..61a101a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
1.17 -> 2.0:
+ - devzero2000: poptint.c reduce variables scope (cppcheck warning)
- devzero2000: poptconfig.c reduce variables scope (cppcheck warning)
- devzero2000: add cppcheck conditional makefile target
- devzero2000: drop expr syntax error in make check under dash
diff --git a/poptint.c b/poptint.c
index e12a474..008d463 100644
--- a/poptint.c
+++ b/poptint.c
@@ -157,7 +157,7 @@ assert(dstr); /* XXX can't happen */
int
POPT_fprintf (FILE * stream, const char * format, ...)
{
- char * b = NULL, * ob = NULL;
+ char * b = NULL;
int rc;
va_list ap;
@@ -191,6 +191,7 @@ POPT_fprintf (FILE * stream, const char * format, ...)
rc = 0;
if (b != NULL) {
#ifdef HAVE_ICONV
+ char * ob = NULL;
ob = strdup_locale_from_utf8(b);
if (ob != NULL) {
rc = fprintf(stream, "%s", ob);