The following commit has been merged in the master branch:
commit 3182adcd391132471e34358c1309de9431dc97fb
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Aug 26 22:46:08 2008 +0300
Reduce header includes by removing unused ones
diff --git a/ChangeLog b/ChangeLog
index 96b9cc5..4de5e5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
2008-09-14 Guillem Jover <[EMAIL PROTECTED]>
+ * dselect/methkeys.cc: Remove unused headers <stdio.h>, <string.h>,
+ <assert.h> and <dpkg.h>.
+ * dselect/pkgkeys.cc: Likewise.
+ * dselect/basetop.cc: Likewise. Remove unused header <ctype.h>.
+ * dselect/curkeys.cc: Remove unused header <dpkg.h>.
+ * dselect/helpmsgs.h: Likewise.
+ * dselect/pkgcmds.cc: Likewise.
+ * dselect/pkgdisplay.cc: Likewise.
+ * dselect/pkginfo.cc: Likewise.
+ * lib/compression.c: Likewise.
+ * lib/dpkg-db.h: Remove unused header <string.h>. Include
+ <sys/types.h>.
+ * lib/md5.c: Remove unused header <netinet/in.h>.
+
+2008-09-14 Guillem Jover <[EMAIL PROTECTED]>
+
* src/main.c (commandfd): Remove left over debug printf.
2008-09-14 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/dselect/basetop.cc b/dselect/basetop.cc
index 83e6185..cbb354f 100644
--- a/dselect/basetop.cc
+++ b/dselect/basetop.cc
@@ -22,12 +22,6 @@
#include <config.h>
#include <compat.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <ctype.h>
-
-#include <dpkg.h>
#include <dpkg-db.h>
#include "dselect.h"
diff --git a/dselect/curkeys.cc b/dselect/curkeys.cc
index e16440c..dd75911 100644
--- a/dselect/curkeys.cc
+++ b/dselect/curkeys.cc
@@ -22,7 +22,6 @@
#include <config.h>
#include <compat.h>
-#include <dpkg.h>
#include <dpkg-db.h>
#include "dselect.h"
diff --git a/dselect/helpmsgs.h b/dselect/helpmsgs.h
index 732fc5b..6e72437 100644
--- a/dselect/helpmsgs.h
+++ b/dselect/helpmsgs.h
@@ -22,8 +22,6 @@
#ifndef HELPMSGS_H
#define HELPMSGS_H
-#include <dpkg.h>
-
struct helpmessage {
const char *title;
const char *text;
diff --git a/dselect/methkeys.cc b/dselect/methkeys.cc
index 0249ea2..c0d2a19 100644
--- a/dselect/methkeys.cc
+++ b/dselect/methkeys.cc
@@ -22,11 +22,6 @@
#include <config.h>
#include <compat.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include <dpkg.h>
#include <dpkg-db.h>
#include "dselect.h"
diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index 31fe2dd..f8f2c10 100644
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -24,7 +24,6 @@
#include <stdio.h>
#include <string.h>
-#include <assert.h>
#include <dpkg.h>
#include <dpkg-db.h>
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index a09ad02..c767043 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
-#include <assert.h>
#include <dpkg.h>
#include <dpkg-db.h>
diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index 8e5a6a4..9599df5 100644
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
-#include <assert.h>
#include <ctype.h>
#include <dpkg.h>
diff --git a/dselect/pkgkeys.cc b/dselect/pkgkeys.cc
index 5bf6902..7f99987 100644
--- a/dselect/pkgkeys.cc
+++ b/dselect/pkgkeys.cc
@@ -22,11 +22,6 @@
#include <config.h>
#include <compat.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include <dpkg.h>
#include <dpkg-db.h>
#include "dselect.h"
diff --git a/lib/compression.c b/lib/compression.c
index 13c2a9f..da9b0f0 100644
--- a/lib/compression.c
+++ b/lib/compression.c
@@ -16,8 +16,6 @@
#endif
#include <dpkg.h>
-
-#include "dpkg.h"
#include "dpkg-db.h"
static void
diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index a686f78..ea758c9 100644
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -27,8 +27,8 @@
DPKG_BEGIN_DECLS
+#include <sys/types.h>
#include <stdio.h>
-#include <string.h>
struct versionrevision {
unsigned long epoch;
diff --git a/lib/md5.c b/lib/md5.c
index 7e89868..2ce0575 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -25,7 +25,6 @@
#include <string.h> /* for memcpy() */
#include <sys/types.h> /* for stupid systems */
-#include <netinet/in.h> /* for ntohl() */
#include "md5.h"
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
