libdpkg: Namespace include guards with LIBDPKG instead of DPKG

lib/dpkg/buffer.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_BUFFER_H
-#define DPKG_BUFFER_H
+#ifndef LIBDPKG_BUFFER_H
+#define LIBDPKG_BUFFER_H
 
 #include <sys/types.h>
 
@@ -152,4 +152,4 @@ off_t buffer_copy(struct buffer_data *read_data,
 
 DPKG_END_DECLS
 
-#endif /* DPKG_BUFFER_H */
+#endif /* LIBDPKG_BUFFER_H */

lib/dpkg/dpkg-db.h

@@ -20,8 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_DB_H
-#define DPKG_DB_H
+#ifndef LIBDPKG_DPKG_DB_H
+#define LIBDPKG_DPKG_DB_H
 
 #include <sys/types.h>
 
@@ -413,4 +413,4 @@ void show1package(const struct lstitem* head, struct pkginfo *pkg);
 
 DPKG_END_DECLS
 
-#endif /* DPKG_DB_H */
+#endif /* LIBDPKG_DPKG_DB_H */

lib/dpkg/dpkg.h

@@ -20,8 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_H
-#define DPKG_H
+#ifndef LIBDPKG_DPKG_H
+#define LIBDPKG_DPKG_H
 
 #ifdef HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
@@ -230,4 +230,4 @@ void compress_cat(enum compress_type type, int fd_in, int fd_out,
 
 DPKG_END_DECLS
 
-#endif /* DPKG_H */
+#endif /* LIBDPKG_DPKG_H */

lib/dpkg/file.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_FILE_H
-#define DPKG_FILE_H
+#ifndef LIBDPKG_FILE_H
+#define LIBDPKG_FILE_H
 
 #include <dpkg/macros.h>
 
@@ -33,5 +33,5 @@ void file_copy_perms(const char *src, const char *dst);
 
 DPKG_END_DECLS
 
-#endif /* DPKG_FILE_H */
+#endif /* LIBDPKG_FILE_H */
 

lib/dpkg/i18n.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_I18N_H
-#define DPKG_I18N_H
+#ifndef LIBDPKG_I18N_H
+#define LIBDPKG_I18N_H
 
 #include <dpkg/macros.h>
 
@@ -33,4 +33,4 @@ DPKG_BEGIN_DECLS
 
 DPKG_END_DECLS
 
-#endif /* DPKG_I18N_H */
+#endif /* LIBDPKG_I18N_H */

lib/dpkg/macros.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_MACROS_H
-#define DPKG_MACROS_H
+#ifndef LIBDPKG_MACROS_H
+#define LIBDPKG_MACROS_H
 
 /* Language definitions. */
 
@@ -56,5 +56,5 @@
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #endif
 
-#endif /* DPKG_MACROS_H */
+#endif /* LIBDPKG_MACROS_H */
 

lib/dpkg/parsedump.h

@@ -20,8 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_PARSEDUMP_H
-#define DPKG_PARSEDUMP_H
+#ifndef LIBDPKG_PARSEDUMP_H
+#define LIBDPKG_PARSEDUMP_H
 
 struct fieldinfo;
 
@@ -88,4 +88,4 @@ extern const struct fieldinfo fieldinfos[];
 extern const struct nickname nicknames[];
 extern const int nfields; /* = elements in fieldinfos, including the sentinels */
 
-#endif /* DPKG_PARSEDUMP_H */
+#endif /* LIBDPKG_PARSEDUMP_H */

lib/dpkg/path.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_PATH_H
-#define DPKG_PATH_H
+#ifndef LIBDPKG_PATH_H
+#define LIBDPKG_PATH_H
 
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
@@ -36,5 +36,5 @@ char *path_quote_filename(char *dst, const char *src, size_t size);
 
 DPKG_END_DECLS
 
-#endif /* DPKG_PATH_H */
+#endif /* LIBDPKG_PATH_H */
 

lib/dpkg/pkg-array.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_PKG_ARRAY_H
-#define DPKG_PKG_ARRAY_H
+#ifndef LIBDPKG_PKG_ARRAY_H
+#define LIBDPKG_PKG_ARRAY_H
 
 #include <config.h>
 #include <compat.h>
@@ -44,4 +44,4 @@ void pkg_array_free(struct pkg_array *a);
 
 DPKG_END_DECLS
 
-#endif /* DPKG_PKG_ARRAY_H */
+#endif /* LIBDPKG_PKG_ARRAY_H */

lib/dpkg/pkg-list.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_PKG_LIST_H
-#define DPKG_PKG_LIST_H
+#ifndef LIBDPKG_PKG_LIST_H
+#define LIBDPKG_PKG_LIST_H
 
 #include <config.h>
 #include <compat.h>
@@ -40,4 +40,4 @@ void pkg_list_prepend(struct pkg_list **head, struct pkginfo *pkg);
 
 DPKG_END_DECLS
 
-#endif /* DPKG_PKG_LIST_H */
+#endif /* LIBDPKG_PKG_LIST_H */

lib/dpkg/pkg.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_PKG_H
-#define DPKG_PKG_H
+#ifndef LIBDPKG_PKG_H
+#define LIBDPKG_PKG_H
 
 #include <dpkg/macros.h>
 
@@ -32,4 +32,4 @@ int pkg_sorter_by_name(const void *a, const void *b);
 
 DPKG_END_DECLS
 
-#endif /* DPKG_PKG_H */
+#endif /* LIBDPKG_PKG_H */

lib/dpkg/progress.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_PROGRESS_H
-#define DPKG_PROGRESS_H
+#ifndef LIBDPKG_PROGRESS_H
+#define LIBDPKG_PROGRESS_H
 
 #include <dpkg/macros.h>
 

lib/dpkg/string.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_STRING_H
-#define DPKG_STRING_H
+#ifndef LIBDPKG_STRING_H
+#define LIBDPKG_STRING_H
 
 #include <dpkg/macros.h>
 
@@ -31,5 +31,5 @@ char *str_strip_quotes(char *str);
 
 DPKG_END_DECLS
 
-#endif /* DPKG_STRING_H */
+#endif /* LIBDPKG_STRING_H */
 

lib/dpkg/subproc.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_SUBPROC_H
-#define DPKG_SUBPROC_H
+#ifndef LIBDPKG_SUBPROC_H
+#define LIBDPKG_SUBPROC_H
 
 #include <sys/types.h>
 
@@ -40,5 +40,5 @@ int waitsubproc(pid_t pid, const char *desc, int flags);
 
 DPKG_END_DECLS
 
-#endif /* DPKG_SUBPROC_H */
+#endif /* LIBDPKG_SUBPROC_H */
 

lib/dpkg/tarfn.h

@@ -1,6 +1,3 @@
-#ifndef	_TAR_FUNCTION_H_
-#define	_TAR_FUNCTION_H_
-
 /*
  * Functions for extracting tar archives.
  * Bruce Perens, April-May 1995
@@ -8,6 +5,9 @@
  * This is free software under the GNU General Public License.
  */
 
+#ifndef LIBDPKG_TARFN_H
+#define LIBDPKG_TARFN_H
+
 #include <sys/types.h>
 
 #include <unistd.h>

lib/dpkg/test.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_TEST_H
-#define DPKG_TEST_H
+#ifndef LIBDPKG_TEST_H
+#define LIBDPKG_TEST_H
 
 #include <config.h>
 #include <compat.h>

lib/dpkg/varbuf.h

@@ -20,8 +20,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DPKG_VARBUF_H
-#define DPKG_VARBUF_H
+#ifndef LIBDPKG_VARBUF_H
+#define LIBDPKG_VARBUF_H
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -139,4 +139,4 @@ varbuf::string()
 }
 #endif
 
-#endif /* DPKG_VARBUF_H */
+#endif /* LIBDPKG_VARBUF_H */