[pacman-dev] [PATCH] Remove unused string.h from src/pacman/remove.c
This header was used in the code for the function strdup() that is not used anymore. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- src/pacman/remove.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 11bc157..1968744 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -21,7 +21,6 @@ #include <stdlib.h> #include <stdio.h> -#include <string.h> #include <alpm.h> #include <alpm_list.h> -- 1.6.3.1
These files include alpm.h, but alpm.h include alpm_list.h so the second inclusion is redundant. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- src/pacman/deptest.c | 1 - src/pacman/package.c | 1 - src/pacman/pacman.c | 1 - src/pacman/query.c | 1 - src/pacman/remove.c | 1 - src/pacman/sync.c | 1 - src/pacman/upgrade.c | 1 - src/pacman/util.c | 1 - 8 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 2feca5c..cbbbbe7 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -24,7 +24,6 @@ #include <string.h> #include <alpm.h> -#include <alpm_list.h> /* pacman */ #include "pacman.h" diff --git a/src/pacman/package.c b/src/pacman/package.c index da2feb5..b44cf81 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -27,7 +27,6 @@ #include <wchar.h> #include <alpm.h> -#include <alpm_list.h> /* pacman */ #include "package.h" diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 72a72ba..d44a371 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -43,7 +43,6 @@ /* alpm */ #include <alpm.h> -#include <alpm_list.h> /* pacman */ #include "pacman.h" diff --git a/src/pacman/query.c b/src/pacman/query.c index 809a5f4..f2b2afd 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -28,7 +28,6 @@ #include <unistd.h> #include <alpm.h> -#include <alpm_list.h> /* pacman */ #include "pacman.h" diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 1968744..63d9ea0 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <alpm.h> -#include <alpm_list.h> /* pacman */ #include "pacman.h" diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 68fb81a..9154839 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -28,7 +28,6 @@ #include <sys/stat.h> #include <alpm.h> -#include <alpm_list.h> /* pacman */ #include "pacman.h" diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 2c99688..971e47c 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -24,7 +24,6 @@ #include <string.h> #include <alpm.h> -#include <alpm_list.h> /* pacman */ #include "pacman.h" diff --git a/src/pacman/util.c b/src/pacman/util.c index a280252..7b63d6f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -36,7 +36,6 @@ #include <wchar.h> #include <alpm.h> -#include <alpm_list.h> /* pacman */ #include "util.h" -- 1.6.3.1
These files include alpm.h, but alpm.h include alpm_list.h so the second inclusion is redundant. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- src/util/testdb.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index abbc62f..aaf4dbf 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -26,7 +26,6 @@ #include <dirent.h> #include <alpm.h> -#include <alpm_list.h> #define BASENAME "testdb" -- 1.6.3.1
These files include alpm.h, but alpm.h include alpm_list.h so the second inclusion is redundant. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- lib/libalpm/alpm.c | 1 - lib/libalpm/be_files.c | 1 - lib/libalpm/cache.c | 1 - lib/libalpm/db.c | 1 - lib/libalpm/dload.c | 1 - lib/libalpm/group.c | 1 - lib/libalpm/handle.c | 1 - lib/libalpm/remove.c | 1 - lib/libalpm/sync.c | 1 - lib/libalpm/trans.c | 1 - lib/libalpm/util.c | 1 - 11 files changed, 0 insertions(+), 11 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index ee29d53..b56346c 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -24,7 +24,6 @@ /* libalpm */ #include "alpm.h" -#include "alpm_list.h" #include "handle.h" #include "util.h" diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 9bb7b3d..5a2d178 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -35,7 +35,6 @@ /* libalpm */ #include "db.h" -#include "alpm_list.h" #include "cache.h" #include "log.h" #include "util.h" diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index 8d18f3e..1771040 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -26,7 +26,6 @@ /* libalpm */ #include "cache.h" -#include "alpm_list.h" #include "log.h" #include "alpm.h" #include "util.h" diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 561967c..c1b9b7c 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -34,7 +34,6 @@ /* libalpm */ #include "db.h" -#include "alpm_list.h" #include "log.h" #include "util.h" #include "handle.h" diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 5b0a691..e439b08 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -40,7 +40,6 @@ /* libalpm */ #include "dload.h" -#include "alpm_list.h" #include "alpm.h" #include "log.h" #include "util.h" diff --git a/lib/libalpm/group.c b/lib/libalpm/group.c index 3e080a5..1fbd142 100644 --- a/lib/libalpm/group.c +++ b/lib/libalpm/group.c @@ -25,7 +25,6 @@ /* libalpm */ #include "group.h" -#include "alpm_list.h" #include "util.h" #include "log.h" #include "alpm.h" diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 813f439..834df05 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -32,7 +32,6 @@ /* libalpm */ #include "handle.h" -#include "alpm_list.h" #include "util.h" #include "log.h" #include "trans.h" diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9dfff9c..e7d01f7 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -34,7 +34,6 @@ /* libalpm */ #include "remove.h" -#include "alpm_list.h" #include "trans.h" #include "util.h" #include "log.h" diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index abda147..6691b86 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -34,7 +34,6 @@ /* libalpm */ #include "sync.h" -#include "alpm_list.h" #include "log.h" #include "package.h" #include "db.h" diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index ef56841..1ec5d88 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -34,7 +34,6 @@ /* libalpm */ #include "trans.h" -#include "alpm_list.h" #include "package.h" #include "util.h" #include "log.h" diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 75f6042..b3151fb 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -46,7 +46,6 @@ #include "log.h" #include "package.h" #include "alpm.h" -#include "alpm_list.h" #include "md5.h" #ifndef HAVE_STRSEP -- 1.6.3.1
Gerardo Exequiel Pozzi wrote:
These files include alpm.h, but alpm.h include alpm_list.h so the second inclusion is redundant.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- src/pacman/deptest.c | 1 - src/pacman/package.c | 1 - src/pacman/pacman.c | 1 - src/pacman/query.c | 1 - src/pacman/remove.c | 1 - src/pacman/sync.c | 1 - src/pacman/upgrade.c | 1 - src/pacman/util.c | 1 - 8 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 2feca5c..cbbbbe7 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -24,7 +24,6 @@ #include <string.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/package.c b/src/pacman/package.c index da2feb5..b44cf81 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -27,7 +27,6 @@ #include <wchar.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "package.h" diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 72a72ba..d44a371 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -43,7 +43,6 @@
/* alpm */ #include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/query.c b/src/pacman/query.c index 809a5f4..f2b2afd 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -28,7 +28,6 @@ #include <unistd.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 1968744..63d9ea0 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -23,7 +23,6 @@ #include <stdio.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 68fb81a..9154839 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -28,7 +28,6 @@ #include <sys/stat.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 2c99688..971e47c 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -24,7 +24,6 @@ #include <string.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/util.c b/src/pacman/util.c index a280252..7b63d6f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -36,7 +36,6 @@ #include <wchar.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "util.h"
Hi Dan, I have a question, what about these patches, will be included, or not yet seen it? I question this because a I see some activity in the last four days in pacman.git. Is necesary to resend the three patches? Thanks. Good luck! -- Gerardo Exequiel Pozzi ( djgera ) http://www.djgera.com.ar KeyID: 0x1B8C330D Key fingerprint = 0CAA D5D4 CD85 4434 A219 76ED 39AB 221B 1B8C 330D
On Sat, Jun 6, 2009 at 2:27 PM, Gerardo Exequiel Pozzi<vmlinuz386@yahoo.com.ar> wrote:
Gerardo Exequiel Pozzi wrote:
These files include alpm.h, but alpm.h include alpm_list.h so the second inclusion is redundant.
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- src/pacman/deptest.c | 1 - src/pacman/package.c | 1 - src/pacman/pacman.c | 1 - src/pacman/query.c | 1 - src/pacman/remove.c | 1 - src/pacman/sync.c | 1 - src/pacman/upgrade.c | 1 - src/pacman/util.c | 1 - 8 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 2feca5c..cbbbbe7 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -24,7 +24,6 @@ #include <string.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/package.c b/src/pacman/package.c index da2feb5..b44cf81 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -27,7 +27,6 @@ #include <wchar.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "package.h" diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 72a72ba..d44a371 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -43,7 +43,6 @@
/* alpm */ #include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/query.c b/src/pacman/query.c index 809a5f4..f2b2afd 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -28,7 +28,6 @@ #include <unistd.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 1968744..63d9ea0 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -23,7 +23,6 @@ #include <stdio.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 68fb81a..9154839 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -28,7 +28,6 @@ #include <sys/stat.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 2c99688..971e47c 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -24,7 +24,6 @@ #include <string.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "pacman.h" diff --git a/src/pacman/util.c b/src/pacman/util.c index a280252..7b63d6f 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -36,7 +36,6 @@ #include <wchar.h>
#include <alpm.h> -#include <alpm_list.h>
/* pacman */ #include "util.h"
Hi Dan,
I have a question, what about these patches, will be included, or not yet seen it? I question this because a I see some activity in the last four days in pacman.git. Is necesary to resend the three patches?
So better late then never here. Yes, redundant, but no, not obviously "extra" or anything like that. These extra imports don't hurt as all headers are correctly fenced, so we don't actually include anything twice, so I'd rather keep it the way it is. In addition, it is quite possible we could change the header layout so suddenly alpm.h did not include the list functions (not the type), and then things would break. -Dan
participants (2)
-
Dan McGee
-
Gerardo Exequiel Pozzi