aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mandocdb.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2013-10-05 20:30:05 +0000
committerIngo Schwarze <schwarze@openbsd.org>2013-10-05 20:30:05 +0000
commit3258c68b4000930085486b62a429c8912720e4f1 (patch)
tree0299c4eeb4311a3f774da835328e441cf4d560a0 /mandocdb.c
parent8e8f529c037160f2344d3a50496c6fb03b9cf2fb (diff)
downloadmandoc-3258c68b4000930085486b62a429c8912720e4f1.tar.gz
mandoc-3258c68b4000930085486b62a429c8912720e4f1.tar.zst
mandoc-3258c68b4000930085486b62a429c8912720e4f1.zip
Cleanup suggested by gcc-4.8.1, following hints by Christos Zoulas:
- avoid bad qualifier casting in roff.c, roff_parsetext() by changing the mandoc_escape arguments to "const char const **" - avoid bad qualifier casting in mandocdb.c, index_merge() - do not complain about unused variables in test-*.c - garbage collect a few unused variables elsewhere
Diffstat (limited to 'mandocdb.c')
-rw-r--r--mandocdb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mandocdb.c b/mandocdb.c
index 028377cc..eb0b5052 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/* $Id: mandocdb.c,v 1.49.2.7 2013/10/02 21:03:26 schwarze Exp $ */
+/* $Id: mandocdb.c,v 1.49.2.8 2013/10/05 20:30:05 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -620,6 +620,8 @@ index_merge(const struct of *of, struct mparse *mp,
uint64_t vbuf[2];
char type;
+ static char emptystring[] = "";
+
if (warnings) {
files = NULL;
hash_reset(&files);
@@ -738,7 +740,7 @@ index_merge(const struct of *of, struct mparse *mp,
val.data = NULL;
val.size = 0;
if (0 == skip)
- val.data = "";
+ val.data = emptystring;
else {
ch = (*files->get)(files, &key, &val, 0);
if (ch < 0) {