libdpkg: Move namevalue declarations to its own header file

lib/dpkg/Makefile.am

@@ -74,6 +74,7 @@ pkginclude_HEADERS = \
 	glob.h \
 	macros.h \
 	myopt.h \
+	namevalue.h \
 	parsedump.h \
 	path.h \
 	pkg.h \

lib/dpkg/dpkg-db.h

@@ -251,10 +251,7 @@ void copy_dependency_links(struct pkginfo *pkg,
 
 /*** from parsehelp.c ***/
 
-struct namevalue {
-  const char *name;
-  int value, length;
-};
+#include <dpkg/namevalue.h>
 
 extern const struct namevalue booleaninfos[];
 extern const struct namevalue priorityinfos[];

lib/dpkg/namevalue.h

@@ -0,0 +1,40 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * namevalue.h - name value structure handling
+ *
+ * Copyright © 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
+ * Copyright © 2009 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBDPKG_NAMEVALUE_H
+#define LIBDPKG_NAMEVALUE_H
+
+#include <dpkg/macros.h>
+
+DPKG_BEGIN_DECLS
+
+struct namevalue {
+	const char *name;
+	int value;
+	int length;
+};
+
+#define NAMEVALUE_DEF(n, v) \
+	[v] = { .name = n, .value = v, .length = sizeof(n) - 1 }
+
+DPKG_END_DECLS
+
+#endif /* LIBDPKG_NAMEVALUE_H */

lib/dpkg/parsehelp.c

@@ -80,9 +80,6 @@ parse_warn(struct parsedb_state *ps,
   va_end(args);
 }
 
-#define NAMEVALUE_DEF(n, v) \
-	[v] = { .name = n, .value = v, .length = sizeof(n) - 1 }
-
 const struct namevalue booleaninfos[] = {
   NAMEVALUE_DEF("no",  false),
   NAMEVALUE_DEF("yes", true),