Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=284a18232e384bf1e6aae54a92c0cb4b36aa3ac2
commit 284a18232e384bf1e6aae54a92c0cb4b36aa3ac2 Author: Michel Hermier <[email protected]> Date: Mon Sep 8 13:43:20 2014 +0200 libpacman: Remove a bunch of unused functions. diff --git a/lib/libpacman/db/syncdb.cpp b/lib/libpacman/db/syncdb.cpp index f8087eb..450a00d 100644 --- a/lib/libpacman/db/syncdb.cpp +++ b/lib/libpacman/db/syncdb.cpp @@ -291,19 +291,4 @@ Package *SyncDatabase::scan(const char *target, unsigned int inforeq) return(NULL); } -static -int _pacman_syncdb_file_reader(SyncDatabase *db, Package *info, unsigned int inforeq, unsigned int inforeq_masq, int (*reader)(Package *, FILE *)) -{ - int ret = 0; - - if(inforeq & inforeq_masq) { - FILE *fp = _pacman_archive_read_fropen(db->m_archive); - - ASSERT(fp != NULL, RET_ERR(PM_ERR_MEMORY, -1)); - ret = reader(info, fp); - fclose(fp); - } - return ret; -} - /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index fdd6279..ec7a073 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -47,18 +47,11 @@ using namespace libpacman; static pmgraph_t *_pacman_graph_new(void) { - pmgraph_t *graph = _pacman_zalloc(sizeof(pmgraph_t)); + pmgraph_t *graph = (pmgraph_t *)_pacman_zalloc(sizeof(pmgraph_t)); return(graph); } -static void _pacman_graph_free(void *data) -{ - pmgraph_t *graph = data; - graph->children.clear(); - free(graph); -} - __pmdepmissing_t::__pmdepmissing_t(const char *target, unsigned char type, unsigned char depmod, const char *depname, const char *depversion) { diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 954bf26..2b982b6 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -331,12 +331,6 @@ int _pacman_strmatcher_match(const FStrMatcher *strmatcher, Package *pkg, int fl return 0; } -static -int PackageMatcher_match_cb(const void *ptr, const void *matcher_data) -{ - return ((const PackageMatcher *)matcher_data)->match((const Package *)ptr); -} - PackageMatcher::PackageMatcher(const char *pattern, int flags, int strmatcher_flags) : m_strmatcher(&m_strmatcher_internal), m_flags(flags), m_strmatcher_internal(pattern, strmatcher_flags) { } diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 446ee14..6eadddc 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -134,25 +134,6 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) return(0); } -static -int _pacman_pkginfo_read(char *descfile, Package *info, int output) -{ - FILE* fp = NULL; - int ret; - - if((fp = fopen(descfile, "r")) == NULL) { - _pacman_log(PM_LOG_ERROR, _("could not open file %s"), descfile); - return(-1); - } - - ret = _pacman_pkginfo_fread(fp, info, output); - - fclose(fp); - unlink(descfile); - - return ret; -} - Package *_pacman_fpmpackage_load(const char *pkgfile) { char *expath; diff --git a/lib/libpacman/package/packagecache.cpp b/lib/libpacman/package/packagecache.cpp index e3c788c..e7a6920 100644 --- a/lib/libpacman/package/packagecache.cpp +++ b/lib/libpacman/package/packagecache.cpp @@ -58,7 +58,7 @@ int _pacman_packagecache_clean(int level) closedir(dir); for(auto i = cache.begin(), end = cache.end(); i != end; i = i->next()) { - char *str = f_stringlistitem_to_str(i); + const char *str = f_stringlistitem_to_str(i); char name[PKG_NAME_LEN], version[PKG_VERSION_LEN]; if(strstr(str, PM_EXT_PKG) == NULL) { @@ -74,7 +74,7 @@ int _pacman_packagecache_clean(int level) continue; } for(auto j = i->next(); j != end; j = j->next()) { - char *s = f_stringlistitem_to_str(j); + const char *s = f_stringlistitem_to_str(j); char n[PKG_NAME_LEN], v[PKG_VERSION_LEN]; if(strstr(s, PM_EXT_PKG) == NULL) { @@ -87,7 +87,7 @@ int _pacman_packagecache_clean(int level) continue; } if(!strcmp(name, n)) { - char *ptr = (pacman_pkg_vercmp(version, v) < 0) ? str : s; + const char *ptr = (pacman_pkg_vercmp(version, v) < 0) ? str : s; if(!_pacman_list_is_strin(ptr, &clean)) { clean.add(ptr); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
