March 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove unneeded header inclusions
by Silvan Jegen 02 Mar '14

02 Mar '14

I checked only a few files but if you think cleaning up the includes is worth the hassle I could continue to check further files. (see: http://sillymon.ch/data/diskspace_8c__incl.png for example) -- >8 -- These headers are included transitively and can be removed. Signed-off-by: Silvan Jegen <s.jegen(a)gmail.com> --- lib/libalpm/add.c | 14 -------------- lib/libalpm/alpm.c | 2 -- lib/libalpm/backup.c | 3 --- lib/libalpm/diskspace.c | 3 --- lib/libalpm/filelist.c | 2 -- lib/libalpm/util.h | 3 --- 6 files changed, 27 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f38afef..133b85c 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -18,31 +18,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> #include <errno.h> -#include <string.h> #include <limits.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> #include <unistd.h> -#include <stdint.h> /* int64_t */ - -/* libarchive */ -#include <archive.h> -#include <archive_entry.h> /* libalpm */ #include "add.h" #include "alpm.h" -#include "alpm_list.h" -#include "handle.h" #include "libarchive-compat.h" -#include "trans.h" #include "util.h" #include "log.h" #include "backup.h" -#include "package.h" #include "db.h" #include "remove.h" #include "handle.h" diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 4a69bf8..a56b17b 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -27,8 +27,6 @@ /* libalpm */ #include "alpm.h" -#include "alpm_list.h" -#include "handle.h" #include "log.h" #include "util.h" diff --git a/lib/libalpm/backup.c b/lib/libalpm/backup.c index c2989b6..10bd0de 100644 --- a/lib/libalpm/backup.c +++ b/lib/libalpm/backup.c @@ -21,9 +21,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <string.h> - /* libalpm */ #include "backup.h" #include "alpm_list.h" diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index d07b188..52d6bf7 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -17,7 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdio.h> #include <errno.h> #if defined(HAVE_MNTENT_H) @@ -44,11 +43,9 @@ /* libalpm */ #include "diskspace.h" -#include "alpm_list.h" #include "util.h" #include "log.h" #include "trans.h" -#include "handle.h" static int mount_point_cmp(const void *p1, const void *p2) { diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 2d2426c..33ac957 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -18,8 +18,6 @@ */ #include <limits.h> -#include <string.h> -#include <sys/stat.h> /* libalpm */ #include "filelist.h" diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 250c530..b7f6c8b 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -24,7 +24,6 @@ #ifndef _ALPM_UTIL_H #define _ALPM_UTIL_H -#include "alpm_list.h" #include "alpm.h" #include "package.h" /* alpm_pkg_t */ #include "handle.h" /* alpm_handle_t */ @@ -40,8 +39,6 @@ #include <float.h> /* DBL_EPSILON */ #include <fcntl.h> /* open, close */ -#include <archive.h> /* struct archive */ - #ifdef ENABLE_NLS #include <libintl.h> /* here so it doesn't need to be included elsewhere */ /* define _() as shortcut for gettext() */ -- 1.9.0

2 2

[pacman-dev] Shabang in scripts
by Pierre Neidhardt 02 Mar '14

02 Mar '14

This maybe a futile question, but not much to lose here so I'm still asking: should we let the autotools change the path of the interpreter in the shabang of the different scripts? (See makepkg and so on.) Actually, according to https://wiki.archlinux.org/index.php/DeveloperWiki:Bash_Coding_Style it is said that the interpreter should be /bin/bash, not /usr/bin/bash. The latter being far less common. Note that the source files are properly set to /bin/*, only the autotools change them to the realpath of the build system. This is really a minor issue, but I believe that switching it back to /bin/bash would remove one portability problem for most systems. For instance, to run makepkg on a non-Arch system, we download the 'pacman' binary package first, from which we extract the 'makepkg' and the 'makepkg.conf' files. Since the package was built on an Arch system, the shabang is set to /usr/bin/bash. On non-Arch system, we usually need to make to change the shabang back to /bin/bash. What do you think? -- Pierre Neidhardt Oh, get ahold of yourself. Nobody's proposing that we parse English. -- Larry Wall in <199709032332.QAA21669(a)wall.org>

2 4

[pacman-dev] [PATCH] makepkg.8: Fix typo
by Pierre Neidhardt 01 Mar '14

01 Mar '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 29f4a03..77a7a83 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -152,7 +152,7 @@ Options *\--allsource*:: Do not actually build the package, but build a source-only tarball that - includes all sources, including those that are normally download via + includes all sources, including those that are normally downloaded via makepkg. This is useful for passing a single tarball to another program such as a chroot or remote builder. It will also satisfy requirements of the GPL when distributing binary packages. -- 1.9.0

1 0