[pacman-dev] [PATCH 3/5] Remove cleanupdelta

Allan McRae allan at archlinux.org
Sat Mar 2 10:19:14 UTC 2019


Signed-off-by: Allan McRae <allan at archlinux.org>
---
 meson.build               |   8 ---
 src/pacman/po/POTFILES.in |   1 -
 src/util/.gitignore       |   2 -
 src/util/Makefile.am      |   5 +-
 src/util/cleanupdelta.c   | 135 --------------------------------------
 src/util/meson.build      |   1 -
 6 files changed, 1 insertion(+), 151 deletions(-)
 delete mode 100644 src/util/cleanupdelta.c

diff --git a/meson.build b/meson.build
index 0f706c64..b810e2fb 100644
--- a/meson.build
+++ b/meson.build
@@ -403,14 +403,6 @@ executable(
   install : true,
 )
 
-executable(
-  'cleanupdelta',
-  cleanupdelta_sources,
-  include_directories : includes,
-  link_with : [libalpm],
-  install : true,
-)
-
 executable(
   'testpkg',
   testpkg_sources,
diff --git a/src/pacman/po/POTFILES.in b/src/pacman/po/POTFILES.in
index f233e9bd..a408d32b 100644
--- a/src/pacman/po/POTFILES.in
+++ b/src/pacman/po/POTFILES.in
@@ -22,6 +22,5 @@ src/pacman/util.c
 
 # utililty files
 src/pacman/pacman-conf.c
-src/util/cleanupdelta.c
 src/util/testpkg.c
 src/util/vercmp.c
\ No newline at end of file
diff --git a/src/util/.gitignore b/src/util/.gitignore
index 4cb3103e..8fc636aa 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -1,7 +1,5 @@
 .deps
 .libs
-cleanupdelta
-cleanupdelta.exe
 testpkg
 testpkg.exe
 vercmp
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 470c79f5..8c6a5771 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -4,7 +4,7 @@ dbpath    = ${localstatedir}/lib/pacman/
 gpgdir    = ${sysconfdir}/pacman.d/gnupg/
 cachedir  = ${localstatedir}/cache/pacman/pkg/
 
-bin_PROGRAMS = vercmp testpkg cleanupdelta
+bin_PROGRAMS = vercmp testpkg
 
 AM_CPPFLAGS = \
 	-imacros $(top_builddir)/config.h \
@@ -18,9 +18,6 @@ AM_CPPFLAGS = \
 AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) \
 	$(LIBARCHIVE_CFLAGS)
 
-cleanupdelta_SOURCES = cleanupdelta.c
-cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
-
 testpkg_SOURCES = testpkg.c
 testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la
 
diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c
deleted file mode 100644
index 34e09c52..00000000
--- a/src/util/cleanupdelta.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *  cleanupdelta.c : return list of unused delta in a given sync database
- *
- *  Copyright (c) 2011-2018 Pacman Development Team <pacman-dev at archlinux.org>
- *
- *  This program 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 program 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/>.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <alpm.h>
-#include <alpm_list.h>
-
-alpm_handle_t *handle = NULL;
-
-static void cleanup(int signum)
-{
-	if(handle && alpm_release(handle) == -1) {
-		fprintf(stderr, "error releasing alpm\n");
-	}
-
-	exit(signum);
-}
-
-__attribute__((format(printf, 2, 0)))
-static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args)
-{
-	if(strlen(fmt)) {
-		switch(level) {
-			case ALPM_LOG_ERROR: printf("error: "); break;
-			case ALPM_LOG_WARNING: printf("warning: "); break;
-			/* case ALPM_LOG_DEBUG: printf("debug: "); break; */
-			default: return;
-		}
-		vprintf(fmt, args);
-	}
-}
-
-
-static void checkpkgs(alpm_list_t *pkglist)
-{
-	alpm_list_t *i, *j;
-	for(i = pkglist; i; i = alpm_list_next(i)) {
-		alpm_pkg_t *pkg = i->data;
-		alpm_list_t *unused = alpm_pkg_unused_deltas(pkg);
-		for(j = unused; j; j = alpm_list_next(j)) {
-			const char *delta = j->data;
-			printf("%s\n", delta);
-		}
-		alpm_list_free(unused);
-	}
-}
-
-static void checkdbs(alpm_list_t *dbnames)
-{
-	alpm_db_t *db = NULL;
-	alpm_list_t *i;
-	const int siglevel = ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
-
-	for(i = dbnames; i; i = alpm_list_next(i)) {
-		const char *dbname = i->data;
-		db = alpm_register_syncdb(handle, dbname, siglevel);
-		if(db == NULL) {
-			fprintf(stderr, "error: could not register sync database '%s' (%s)\n",
-					dbname, alpm_strerror(alpm_errno(handle)));
-			continue;
-		}
-		checkpkgs(alpm_db_get_pkgcache(db));
-	}
-
-}
-
-static void usage(void)
-{
-	fprintf(stderr, "cleanupdelta (pacman) v" PACKAGE_VERSION "\n\n"
-			"Returns a list of unused delta in a given sync database.\n\n"
-			"Usage: cleanupdelta [options]\n\n"
-			"  -b <pacman db>       core extra ... : check the listed sync databases\n");
-	exit(1);
-}
-
-int main(int argc, char *argv[])
-{
-	const char *dbpath = DBPATH;
-	alpm_errno_t err;
-	int a = 1;
-	alpm_list_t *dbnames = NULL;
-
-	while(a < argc) {
-		if(strcmp(argv[a], "-b") == 0) {
-			if(++a < argc) {
-				dbpath = argv[a];
-			} else {
-				usage();
-			}
-		}	else if(strcmp(argv[a], "-h") == 0 ||
-				strcmp(argv[a], "--help") == 0 ) {
-			usage();
-		} else {
-			dbnames = alpm_list_add(dbnames, argv[a]);
-		}
-		a++;
-	}
-
-	if(!dbnames) {
-		usage();
-	}
-
-	handle = alpm_initialize(ROOTDIR, dbpath, &err);
-	if(!handle) {
-		fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerror(err));
-		return 1;
-	}
-
-	/* let us get log messages from libalpm */
-	alpm_option_set_logcb(handle, output_cb);
-
-	checkdbs(dbnames);
-	alpm_list_free(dbnames);
-
-	cleanup(0);
-}
diff --git a/src/util/meson.build b/src/util/meson.build
index cc219670..c0063f02 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -1,3 +1,2 @@
-cleanupdelta_sources = files('cleanupdelta.c')
 testpkg_sources = files('testpkg.c')
 vercmp_sources = files('vercmp.c')
-- 
2.20.1


More information about the pacman-dev mailing list