bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove ALPM_LOG_FUNC macro

Browse source 
The usefulness of this is rather limited due to it not being compiled
into production builds. When you do choose to see the output, it is
often overwhelming and not helpful. The best bet is to use a debugger
and/or well-placed fprintf() statements.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-06-03 11:48:24 -05:00
parent 9d73b261cf
commit 78cbc045c1
22 changed files with 0 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libalpm/add.c
View file

@ -55,8 +55,6 @@ int SYMEXPORT alpm_add_pkg(pmpkg_t *pkg)
pmdb_t *db_local; pmdb_t *db_local;
pmpkg_t *local; pmpkg_t *local;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
@ -474,8 +472,6 @@ static int commit_single_pkg(pmpkg_t *newpkg, size_t pkg_current,
int is_upgrade = 0; int is_upgrade = 0;
pmpkg_t *oldpkg = NULL; pmpkg_t *oldpkg = NULL;
ALPM_LOG_FUNC;
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", snprintf(scriptlet, PATH_MAX, "%s%s-%s/install",
@ -708,8 +704,6 @@ int _alpm_upgrade_packages(pmtrans_t *trans, pmdb_t *db)
int skip_ldconfig = 0, ret = 0; int skip_ldconfig = 0, ret = 0;
alpm_list_t *targ; alpm_list_t *targ;
ALPM_LOG_FUNC;
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));

2
lib/libalpm/alpm.c
View file

@ -79,8 +79,6 @@ int SYMEXPORT alpm_release(void)
{ {
pmdb_t *db; pmdb_t *db;
ALPM_LOG_FUNC;
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
/* close local database */ /* close local database */

2
lib/libalpm/backup.c
View file

@ -83,8 +83,6 @@ char *_alpm_needbackup(const char *file, const alpm_list_t *backup)
{ {
const alpm_list_t *lp; const alpm_list_t *lp;
ALPM_LOG_FUNC;
if(file == NULL || backup == NULL) { if(file == NULL || backup == NULL) {
return NULL; return NULL;
} }

19
lib/libalpm/be_local.c
View file

@ -44,7 +44,6 @@
#define LAZY_LOAD(info, errret) \ #define LAZY_LOAD(info, errret) \
do { \ do { \
ALPM_LOG_FUNC; \
ASSERT(handle != NULL, return (errret)); \ ASSERT(handle != NULL, return (errret)); \
if(pkg->origin != PKG_FROM_FILE && !(pkg->infolevel & info)) { \ if(pkg->origin != PKG_FROM_FILE && !(pkg->infolevel & info)) { \
_alpm_local_db_read(pkg->origin_data.db, pkg, info); \ _alpm_local_db_read(pkg->origin_data.db, pkg, info); \
@ -138,8 +137,6 @@ static alpm_list_t *_cache_get_groups(pmpkg_t *pkg)
static int _cache_has_scriptlet(pmpkg_t *pkg) static int _cache_has_scriptlet(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return -1); ASSERT(handle != NULL, return -1);
@ -187,8 +184,6 @@ static alpm_list_t *_cache_get_deltas(pmpkg_t UNUSED *pkg)
static alpm_list_t *_cache_get_files(pmpkg_t *pkg) static alpm_list_t *_cache_get_files(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
@ -201,8 +196,6 @@ static alpm_list_t *_cache_get_files(pmpkg_t *pkg)
static alpm_list_t *_cache_get_backup(pmpkg_t *pkg) static alpm_list_t *_cache_get_backup(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
@ -221,8 +214,6 @@ static alpm_list_t *_cache_get_backup(pmpkg_t *pkg)
*/ */
static void *_cache_changelog_open(pmpkg_t *pkg) static void *_cache_changelog_open(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
@ -346,8 +337,6 @@ static int local_db_populate(pmdb_t *db)
const char *dbpath; const char *dbpath;
DIR *dbdir; DIR *dbdir;
ALPM_LOG_FUNC;
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
dbpath = _alpm_db_path(db); dbpath = _alpm_db_path(db);
@ -473,8 +462,6 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
char line[1024]; char line[1024];
char *pkgpath = NULL; char *pkgpath = NULL;
ALPM_LOG_FUNC;
if(db == NULL) { if(db == NULL) {
RET_ERR(PM_ERR_DB_NULL, -1); RET_ERR(PM_ERR_DB_NULL, -1);
} }
@ -721,8 +708,6 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
int retval = 0; int retval = 0;
char *pkgpath = NULL; char *pkgpath = NULL;
ALPM_LOG_FUNC;
if(db == NULL || info == NULL) { if(db == NULL || info == NULL) {
return -1; return -1;
} }
@ -884,8 +869,6 @@ int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info)
int ret = 0; int ret = 0;
char *pkgpath = NULL; char *pkgpath = NULL;
ALPM_LOG_FUNC;
if(db == NULL || info == NULL) { if(db == NULL || info == NULL) {
RET_ERR(PM_ERR_DB_NULL, -1); RET_ERR(PM_ERR_DB_NULL, -1);
} }
@ -962,8 +945,6 @@ pmdb_t *_alpm_db_register_local(void)
{ {
pmdb_t *db; pmdb_t *db;
ALPM_LOG_FUNC;
_alpm_log(PM_LOG_DEBUG, "registering local database\n"); _alpm_log(PM_LOG_DEBUG, "registering local database\n");
db = _alpm_db_new("local", 1); db = _alpm_db_new("local", 1);

8
lib/libalpm/be_package.c
View file

@ -43,8 +43,6 @@
*/ */
static void *_package_changelog_open(pmpkg_t *pkg) static void *_package_changelog_open(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
ASSERT(pkg != NULL, return NULL); ASSERT(pkg != NULL, return NULL);
struct archive *archive = NULL; struct archive *archive = NULL;
@ -144,8 +142,6 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
int linenum = 0; int linenum = 0;
struct archive_read_buffer buf; struct archive_read_buffer buf;
ALPM_LOG_FUNC;
memset(&buf, 0, sizeof(buf)); memset(&buf, 0, sizeof(buf));
/* 512K for a line length seems reasonable */ /* 512K for a line length seems reasonable */
buf.max_line_size = 512 * 1024; buf.max_line_size = 512 * 1024;
@ -236,8 +232,6 @@ pmpkg_t *_alpm_pkg_load_internal(const char *pkgfile, int full,
pmpkg_t *newpkg = NULL; pmpkg_t *newpkg = NULL;
struct stat st; struct stat st;
ALPM_LOG_FUNC;
if(pkgfile == NULL || strlen(pkgfile) == 0) { if(pkgfile == NULL || strlen(pkgfile) == 0) {
RET_ERR(PM_ERR_WRONG_ARGS, NULL); RET_ERR(PM_ERR_WRONG_ARGS, NULL);
} }
@ -383,8 +377,6 @@ error:
int SYMEXPORT alpm_pkg_load(const char *filename, int full, int SYMEXPORT alpm_pkg_load(const char *filename, int full,
pgp_verify_t check_sig, pmpkg_t **pkg) pgp_verify_t check_sig, pmpkg_t **pkg)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));

7
lib/libalpm/be_sync.c
View file

@ -87,8 +87,6 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
mode_t oldmask; mode_t oldmask;
pgp_verify_t check_sig; pgp_verify_t check_sig;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(db != NULL && db != handle->db_local, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(db != NULL && db != handle->db_local, RET_ERR(PM_ERR_WRONG_ARGS, -1));
@ -242,8 +240,6 @@ static int sync_db_populate(pmdb_t *db)
struct archive_entry *entry; struct archive_entry *entry;
pmpkg_t *pkg = NULL; pmpkg_t *pkg = NULL;
ALPM_LOG_FUNC;
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
if((archive = archive_read_new()) == NULL) { if((archive = archive_read_new()) == NULL) {
@ -360,8 +356,6 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
pmpkg_t *pkg; pmpkg_t *pkg;
struct archive_read_buffer buf; struct archive_read_buffer buf;
ALPM_LOG_FUNC;
if(db == NULL) { if(db == NULL) {
RET_ERR(PM_ERR_DB_NULL, -1); RET_ERR(PM_ERR_DB_NULL, -1);
} }
@ -512,7 +506,6 @@ pmdb_t *_alpm_db_register_sync(const char *treename)
{ {
pmdb_t *db; pmdb_t *db;
ALPM_LOG_FUNC;
_alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename); _alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename);
db = _alpm_db_new(treename, 0); db = _alpm_db_new(treename, 0);

24
lib/libalpm/conflict.c
View file

@ -45,8 +45,6 @@ pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2,
{ {
pmconflict_t *conflict; pmconflict_t *conflict;
ALPM_LOG_FUNC;
MALLOC(conflict, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); MALLOC(conflict, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL));
STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL));
@ -82,8 +80,6 @@ static int conflict_isin(pmconflict_t *needle, alpm_list_t *haystack)
const char *npkg1 = needle->package1; const char *npkg1 = needle->package1;
const char *npkg2 = needle->package2; const char *npkg2 = needle->package2;
ALPM_LOG_FUNC;
for(i = haystack; i; i = i->next) { for(i = haystack; i; i = i->next) {
pmconflict_t *conflict = i->data; pmconflict_t *conflict = i->data;
const char *cpkg1 = conflict->package1; const char *cpkg1 = conflict->package1;
@ -168,8 +164,6 @@ alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages)
{ {
alpm_list_t *baddeps = NULL; alpm_list_t *baddeps = NULL;
ALPM_LOG_FUNC;
_alpm_log(PM_LOG_DEBUG, "check targets vs targets\n"); _alpm_log(PM_LOG_DEBUG, "check targets vs targets\n");
check_conflict(packages, packages, &baddeps, 0); check_conflict(packages, packages, &baddeps, 0);
@ -184,8 +178,6 @@ alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages)
{ {
alpm_list_t *baddeps = NULL; alpm_list_t *baddeps = NULL;
ALPM_LOG_FUNC;
if(db == NULL) { if(db == NULL) {
return NULL; return NULL;
} }
@ -359,8 +351,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
size_t numtargs = alpm_list_count(upgrade); size_t numtargs = alpm_list_count(upgrade);
size_t current; size_t current;
ALPM_LOG_FUNC;
if(db == NULL || upgrade == NULL || trans == NULL) { if(db == NULL || upgrade == NULL || trans == NULL) {
return NULL; return NULL;
} }
@ -517,8 +507,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(conflict != NULL, return NULL); ASSERT(conflict != NULL, return NULL);
@ -528,8 +516,6 @@ const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict)
const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(conflict != NULL, return NULL); ASSERT(conflict != NULL, return NULL);
@ -539,8 +525,6 @@ const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict)
const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(conflict != NULL, return NULL); ASSERT(conflict != NULL, return NULL);
@ -550,8 +534,6 @@ const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict)
const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(conflict != NULL, return NULL); ASSERT(conflict != NULL, return NULL);
@ -561,8 +543,6 @@ const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict)
pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conflict) pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conflict)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return -1); ASSERT(handle != NULL, return -1);
ASSERT(conflict != NULL, return -1); ASSERT(conflict != NULL, return -1);
@ -572,8 +552,6 @@ pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conf
const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(conflict != NULL, return NULL); ASSERT(conflict != NULL, return NULL);
@ -583,8 +561,6 @@ const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict)
const char SYMEXPORT *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(conflict != NULL, return NULL); ASSERT(conflict != NULL, return NULL);

60
lib/libalpm/db.c
View file

@ -47,8 +47,6 @@
/** Register a sync database of packages. */ /** Register a sync database of packages. */
pmdb_t SYMEXPORT *alpm_db_register_sync(const char *treename) pmdb_t SYMEXPORT *alpm_db_register_sync(const char *treename)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, NULL)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, NULL));
ASSERT(treename != NULL && strlen(treename) != 0, RET_ERR(PM_ERR_WRONG_ARGS, NULL)); ASSERT(treename != NULL && strlen(treename) != 0, RET_ERR(PM_ERR_WRONG_ARGS, NULL));
@ -75,8 +73,6 @@ int SYMEXPORT alpm_db_unregister_all(void)
alpm_list_t *i; alpm_list_t *i;
pmdb_t *db; pmdb_t *db;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
/* Do not unregister a database if a transaction is on-going */ /* Do not unregister a database if a transaction is on-going */
@ -97,8 +93,6 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db)
{ {
int found = 0; int found = 0;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(db != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
@ -132,8 +126,6 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db)
/** Get the serverlist of a database. */ /** Get the serverlist of a database. */
alpm_list_t SYMEXPORT *alpm_db_get_servers(const pmdb_t *db) alpm_list_t SYMEXPORT *alpm_db_get_servers(const pmdb_t *db)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL));
@ -143,8 +135,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_servers(const pmdb_t *db)
/** Set the serverlist of a database. */ /** Set the serverlist of a database. */
int SYMEXPORT alpm_db_set_servers(pmdb_t *db, alpm_list_t *servers) int SYMEXPORT alpm_db_set_servers(pmdb_t *db, alpm_list_t *servers)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
@ -175,8 +165,6 @@ int SYMEXPORT alpm_db_add_server(pmdb_t *db, const char *url)
{ {
char *newurl; char *newurl;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
ASSERT(url != NULL && strlen(url) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(url != NULL && strlen(url) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
@ -202,8 +190,6 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url)
{ {
char *newurl, *vdata = NULL; char *newurl, *vdata = NULL;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
ASSERT(url != NULL && strlen(url) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(url != NULL && strlen(url) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
@ -230,8 +216,6 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url)
*/ */
int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify) int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
@ -245,8 +229,6 @@ int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify)
/** Get the name of a package database. */ /** Get the name of a package database. */
const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db) const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(db != NULL, return NULL); ASSERT(db != NULL, return NULL);
@ -259,8 +241,6 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db)
{ {
char *url; char *url;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(db != NULL, return NULL); ASSERT(db != NULL, return NULL);
@ -275,8 +255,6 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db)
/** Get a package entry from a package database. */ /** Get a package entry from a package database. */
pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name) pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(db != NULL, return NULL); ASSERT(db != NULL, return NULL);
@ -288,8 +266,6 @@ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
/** Get the package cache of a package database. */ /** Get the package cache of a package database. */
alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db) alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(db != NULL, return NULL); ASSERT(db != NULL, return NULL);
@ -300,8 +276,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db)
/** Get a group entry from a package database. */ /** Get a group entry from a package database. */
pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name) pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(db != NULL, return NULL); ASSERT(db != NULL, return NULL);
@ -313,8 +287,6 @@ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
/** Get the group cache of a package database. */ /** Get the group cache of a package database. */
alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db) alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(db != NULL, return NULL); ASSERT(db != NULL, return NULL);
@ -325,8 +297,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
/** Searches a database. */ /** Searches a database. */
alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, return NULL); ASSERT(handle != NULL, return NULL);
ASSERT(db != NULL, return NULL); ASSERT(db != NULL, return NULL);
@ -337,8 +307,6 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
/** Set install reason for a package in db. */ /** Set install reason for a package in db. */
int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason) int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
@ -369,8 +337,6 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local)
{ {
pmdb_t *db; pmdb_t *db;
ALPM_LOG_FUNC;
CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL)); CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL));
STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL));
db->is_local = is_local; db->is_local = is_local;
@ -380,8 +346,6 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local)
void _alpm_db_free(pmdb_t *db) void _alpm_db_free(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
/* cleanup pkgcache */ /* cleanup pkgcache */
_alpm_db_free_pkgcache(db); _alpm_db_free_pkgcache(db);
/* cleanup server list */ /* cleanup server list */
@ -446,8 +410,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
/* copy the pkgcache- we will free the list var after each needle */ /* copy the pkgcache- we will free the list var after each needle */
alpm_list_t *list = alpm_list_copy(_alpm_db_get_pkgcache(db)); alpm_list_t *list = alpm_list_copy(_alpm_db_get_pkgcache(db));
ALPM_LOG_FUNC;
for(i = needles; i; i = i->next) { for(i = needles; i; i = i->next) {
char *targ; char *targ;
regex_t reg; regex_t reg;
@ -520,8 +482,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
*/ */
int _alpm_db_load_pkgcache(pmdb_t *db) int _alpm_db_load_pkgcache(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
if(db == NULL) { if(db == NULL) {
return -1; return -1;
} }
@ -541,8 +501,6 @@ int _alpm_db_load_pkgcache(pmdb_t *db)
void _alpm_db_free_pkgcache(pmdb_t *db) void _alpm_db_free_pkgcache(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
if(db == NULL || !db->pkgcache_loaded) { if(db == NULL || !db->pkgcache_loaded) {
return; return;
} }
@ -560,8 +518,6 @@ void _alpm_db_free_pkgcache(pmdb_t *db)
pmpkghash_t *_alpm_db_get_pkgcache_hash(pmdb_t *db) pmpkghash_t *_alpm_db_get_pkgcache_hash(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
if(db == NULL) { if(db == NULL) {
return NULL; return NULL;
} }
@ -580,8 +536,6 @@ pmpkghash_t *_alpm_db_get_pkgcache_hash(pmdb_t *db)
alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db) alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
pmpkghash_t *hash = _alpm_db_get_pkgcache_hash(db); pmpkghash_t *hash = _alpm_db_get_pkgcache_hash(db);
if(hash == NULL) { if(hash == NULL) {
@ -596,8 +550,6 @@ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg)
{ {
pmpkg_t *newpkg; pmpkg_t *newpkg;
ALPM_LOG_FUNC;
if(db == NULL || !db->pkgcache_loaded || pkg == NULL) { if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
return -1; return -1;
} }
@ -620,8 +572,6 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg)
{ {
pmpkg_t *data = NULL; pmpkg_t *data = NULL;
ALPM_LOG_FUNC;
if(db == NULL || !db->pkgcache_loaded || pkg == NULL) { if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
return -1; return -1;
} }
@ -646,8 +596,6 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg)
pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target) pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target)
{ {
ALPM_LOG_FUNC;
if(db == NULL) { if(db == NULL) {
return NULL; return NULL;
} }
@ -668,8 +616,6 @@ int _alpm_db_load_grpcache(pmdb_t *db)
{ {
alpm_list_t *lp; alpm_list_t *lp;
ALPM_LOG_FUNC;
if(db == NULL) { if(db == NULL) {
return -1; return -1;
} }
@ -716,8 +662,6 @@ void _alpm_db_free_grpcache(pmdb_t *db)
{ {
alpm_list_t *lg; alpm_list_t *lg;
ALPM_LOG_FUNC;
if(db == NULL || !db->grpcache_loaded) { if(db == NULL || !db->grpcache_loaded) {
return; return;
} }
@ -735,8 +679,6 @@ void _alpm_db_free_grpcache(pmdb_t *db)
alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db) alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
if(db == NULL) { if(db == NULL) {
return NULL; return NULL;
} }
@ -752,8 +694,6 @@ pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target)
{ {
alpm_list_t *i; alpm_list_t *i;
ALPM_LOG_FUNC;
if(db == NULL || target == NULL || strlen(target) == 0) { if(db == NULL || target == NULL || strlen(target) == 0) {
return NULL; return NULL;
} }

2
lib/libalpm/delta.c
View file

@ -225,8 +225,6 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas,
alpm_list_t *vertices; alpm_list_t *vertices;
off_t bestsize = LONG_MAX; off_t bestsize = LONG_MAX;
ALPM_LOG_FUNC;
if(deltas == NULL) { if(deltas == NULL) {
*path = NULL; *path = NULL;
return bestsize; return bestsize;

24
lib/libalpm/deps.c
View file

@ -48,8 +48,6 @@ static pmdepmissing_t *depmiss_new(const char *target, pmdepend_t *dep,
{ {
pmdepmissing_t *miss; pmdepmissing_t *miss;
ALPM_LOG_FUNC;
MALLOC(miss, sizeof(pmdepmissing_t), RET_ERR(PM_ERR_MEMORY, NULL)); MALLOC(miss, sizeof(pmdepmissing_t), RET_ERR(PM_ERR_MEMORY, NULL));
STRDUP(miss->target, target, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(miss->target, target, RET_ERR(PM_ERR_MEMORY, NULL));
@ -134,8 +132,6 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse)
alpm_list_t *vptr; alpm_list_t *vptr;
pmgraph_t *vertex; pmgraph_t *vertex;
ALPM_LOG_FUNC;
if(targets == NULL) { if(targets == NULL) {
return NULL; return NULL;
} }
@ -271,8 +267,6 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
alpm_list_t *baddeps = NULL; alpm_list_t *baddeps = NULL;
int nodepversion; int nodepversion;
ALPM_LOG_FUNC;
targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade)); targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade));
for(i = pkglist; i; i = i->next) { for(i = pkglist; i; i = i->next) {
pmpkg_t *pkg = i->data; pmpkg_t *pkg = i->data;
@ -521,8 +515,6 @@ void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit)
{ {
alpm_list_t *i, *j; alpm_list_t *i, *j;
ALPM_LOG_FUNC;
if(db == NULL || targs == NULL) { if(db == NULL || targs == NULL) {
return; return;
} }
@ -696,8 +688,6 @@ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pk
alpm_list_t *deps = NULL; alpm_list_t *deps = NULL;
alpm_list_t *packages_copy; alpm_list_t *packages_copy;
ALPM_LOG_FUNC;
if(_alpm_pkg_find(*packages, pkg->name) != NULL) { if(_alpm_pkg_find(*packages, pkg->name) != NULL) {
return 0; return 0;
} }
@ -765,8 +755,6 @@ int _alpm_resolvedeps(alpm_list_t *localpkgs, alpm_list_t *dbs_sync, pmpkg_t *pk
const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss) const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(miss != NULL, return NULL); ASSERT(miss != NULL, return NULL);
@ -775,8 +763,6 @@ const char SYMEXPORT *alpm_miss_get_target(const pmdepmissing_t *miss)
const char SYMEXPORT *alpm_miss_get_causingpkg(const pmdepmissing_t *miss) const char SYMEXPORT *alpm_miss_get_causingpkg(const pmdepmissing_t *miss)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(miss != NULL, return NULL); ASSERT(miss != NULL, return NULL);
@ -785,8 +771,6 @@ const char SYMEXPORT *alpm_miss_get_causingpkg(const pmdepmissing_t *miss)
pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(miss != NULL, return NULL); ASSERT(miss != NULL, return NULL);
@ -795,8 +779,6 @@ pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss)
pmdepmod_t SYMEXPORT alpm_dep_get_mod(const pmdepend_t *dep) pmdepmod_t SYMEXPORT alpm_dep_get_mod(const pmdepend_t *dep)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(dep != NULL, return -1); ASSERT(dep != NULL, return -1);
@ -805,8 +787,6 @@ pmdepmod_t SYMEXPORT alpm_dep_get_mod(const pmdepend_t *dep)
const char SYMEXPORT *alpm_dep_get_name(const pmdepend_t *dep) const char SYMEXPORT *alpm_dep_get_name(const pmdepend_t *dep)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(dep != NULL, return NULL); ASSERT(dep != NULL, return NULL);
@ -815,8 +795,6 @@ const char SYMEXPORT *alpm_dep_get_name(const pmdepend_t *dep)
const char SYMEXPORT *alpm_dep_get_version(const pmdepend_t *dep) const char SYMEXPORT *alpm_dep_get_version(const pmdepend_t *dep)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(dep != NULL, return NULL); ASSERT(dep != NULL, return NULL);
@ -834,8 +812,6 @@ char SYMEXPORT *alpm_dep_compute_string(const pmdepend_t *dep)
char *str; char *str;
size_t len; size_t len;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(dep != NULL, return NULL); ASSERT(dep != NULL, return NULL);

2
lib/libalpm/dload.c
View file

@ -335,8 +335,6 @@ char SYMEXPORT *alpm_fetch_pkgurl(const char *url)
const char *filename, *cachedir; const char *filename, *cachedir;
int ret; int ret;
ALPM_LOG_FUNC;
filename = get_filename(url); filename = get_filename(url);
/* find a valid cache dir to download to */ /* find a valid cache dir to download to */

8
lib/libalpm/group.c
View file

@ -34,8 +34,6 @@ pmgrp_t *_alpm_grp_new(const char *name)
{ {
pmgrp_t* grp; pmgrp_t* grp;
ALPM_LOG_FUNC;
CALLOC(grp, 1, sizeof(pmgrp_t), RET_ERR(PM_ERR_MEMORY, NULL)); CALLOC(grp, 1, sizeof(pmgrp_t), RET_ERR(PM_ERR_MEMORY, NULL));
STRDUP(grp->name, name, RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(grp->name, name, RET_ERR(PM_ERR_MEMORY, NULL));
@ -44,8 +42,6 @@ pmgrp_t *_alpm_grp_new(const char *name)
void _alpm_grp_free(pmgrp_t *grp) void _alpm_grp_free(pmgrp_t *grp)
{ {
ALPM_LOG_FUNC;
if(grp == NULL) { if(grp == NULL) {
return; return;
} }
@ -58,8 +54,6 @@ void _alpm_grp_free(pmgrp_t *grp)
const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp) const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(grp != NULL, return NULL); ASSERT(grp != NULL, return NULL);
@ -68,8 +62,6 @@ const char SYMEXPORT *alpm_grp_get_name(const pmgrp_t *grp)
alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(const pmgrp_t *grp) alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(const pmgrp_t *grp)
{ {
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(grp != NULL, return NULL); ASSERT(grp != NULL, return NULL);

12
lib/libalpm/handle.c
View file

@ -53,8 +53,6 @@ pmhandle_t *_alpm_handle_new()
void _alpm_handle_free(pmhandle_t *handle) void _alpm_handle_free(pmhandle_t *handle)
{ {
ALPM_LOG_FUNC;
if(handle == NULL) { if(handle == NULL) {
return; return;
} }
@ -306,8 +304,6 @@ int SYMEXPORT alpm_option_set_root(const char *root)
char *realroot; char *realroot;
size_t rootlen; size_t rootlen;
ALPM_LOG_FUNC;
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
if(!root) { if(!root) {
@ -348,8 +344,6 @@ int SYMEXPORT alpm_option_set_dbpath(const char *dbpath)
size_t dbpathlen, lockfilelen; size_t dbpathlen, lockfilelen;
const char *lf = "db.lck"; const char *lf = "db.lck";
ALPM_LOG_FUNC;
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
if(!dbpath) { if(!dbpath) {
pm_errno = PM_ERR_WRONG_ARGS; pm_errno = PM_ERR_WRONG_ARGS;
@ -387,8 +381,6 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir)
char *newcachedir; char *newcachedir;
size_t cachedirlen; size_t cachedirlen;
ALPM_LOG_FUNC;
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
if(!cachedir) { if(!cachedir) {
pm_errno = PM_ERR_WRONG_ARGS; pm_errno = PM_ERR_WRONG_ARGS;
@ -445,8 +437,6 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
{ {
char *oldlogfile = handle->logfile; char *oldlogfile = handle->logfile;
ALPM_LOG_FUNC;
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
if(!logfile) { if(!logfile) {
pm_errno = PM_ERR_WRONG_ARGS; pm_errno = PM_ERR_WRONG_ARGS;
@ -470,8 +460,6 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
int SYMEXPORT alpm_option_set_signaturedir(const char *signaturedir) int SYMEXPORT alpm_option_set_signaturedir(const char *signaturedir)
{ {
ALPM_LOG_FUNC;
if(!signaturedir) { if(!signaturedir) {
pm_errno = PM_ERR_WRONG_ARGS; pm_errno = PM_ERR_WRONG_ARGS;
return -1; return -1;

2
lib/libalpm/log.c
View file

@ -44,8 +44,6 @@ int SYMEXPORT alpm_logaction(const char *fmt, ...)
int ret; int ret;
va_list args; va_list args;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));

7
lib/libalpm/log.h
View file

@ -22,13 +22,6 @@
#include "alpm.h" #include "alpm.h"
#ifdef PACMAN_DEBUG
/* Log funtion entry points if debugging is enabled */
#define ALPM_LOG_FUNC _alpm_log(PM_LOG_FUNCTION, "Enter %s\n", __func__)
#else
#define ALPM_LOG_FUNC
#endif
void _alpm_log(pmloglevel_t flag, const char *fmt, ...) __attribute__((format(printf,2,3))); void _alpm_log(pmloglevel_t flag, const char *fmt, ...) __attribute__((format(printf,2,3)));
#endif /* _ALPM_LOG_H */ #endif /* _ALPM_LOG_H */

16
lib/libalpm/package.c
View file

@ -45,8 +45,6 @@
/** Free a package. */ /** Free a package. */
int SYMEXPORT alpm_pkg_free(pmpkg_t *pkg) int SYMEXPORT alpm_pkg_free(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
/* Only free packages loaded in user space */ /* Only free packages loaded in user space */
@ -63,8 +61,6 @@ int SYMEXPORT alpm_pkg_checkmd5sum(pmpkg_t *pkg)
char *fpath; char *fpath;
int retval; int retval;
ALPM_LOG_FUNC;
ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
/* We only inspect packages from sync repositories */ /* We only inspect packages from sync repositories */
ASSERT(pkg->origin == PKG_FROM_SYNCDB, RET_ERR(PM_ERR_PKG_INVALID, -1)); ASSERT(pkg->origin == PKG_FROM_SYNCDB, RET_ERR(PM_ERR_PKG_INVALID, -1));
@ -370,8 +366,6 @@ pmpkg_t *_alpm_pkg_new(void)
{ {
pmpkg_t* pkg; pmpkg_t* pkg;
ALPM_LOG_FUNC;
CALLOC(pkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL)); CALLOC(pkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL));
return pkg; return pkg;
@ -382,8 +376,6 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg)
pmpkg_t *newpkg; pmpkg_t *newpkg;
alpm_list_t *i; alpm_list_t *i;
ALPM_LOG_FUNC;
CALLOC(newpkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL)); CALLOC(newpkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL));
newpkg->name_hash = pkg->name_hash; newpkg->name_hash = pkg->name_hash;
@ -430,8 +422,6 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg)
void _alpm_pkg_free(pmpkg_t *pkg) void _alpm_pkg_free(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
if(pkg == NULL) { if(pkg == NULL) {
return; return;
} }
@ -473,8 +463,6 @@ void _alpm_pkg_free(pmpkg_t *pkg)
*/ */
void _alpm_pkg_free_trans(pmpkg_t *pkg) void _alpm_pkg_free_trans(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
if(pkg == NULL) { if(pkg == NULL) {
return; return;
} }
@ -491,8 +479,6 @@ void _alpm_pkg_free_trans(pmpkg_t *pkg)
/* Is spkg an upgrade for localpkg? */ /* Is spkg an upgrade for localpkg? */
int _alpm_pkg_compare_versions(pmpkg_t *spkg, pmpkg_t *localpkg) int _alpm_pkg_compare_versions(pmpkg_t *spkg, pmpkg_t *localpkg)
{ {
ALPM_LOG_FUNC;
return alpm_pkg_vercmp(alpm_pkg_get_version(spkg), return alpm_pkg_vercmp(alpm_pkg_get_version(spkg),
alpm_pkg_get_version(localpkg)); alpm_pkg_get_version(localpkg));
} }
@ -514,8 +500,6 @@ pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle)
alpm_list_t *lp; alpm_list_t *lp;
unsigned long needle_hash; unsigned long needle_hash;
ALPM_LOG_FUNC;
if(needle == NULL || haystack == NULL) { if(needle == NULL || haystack == NULL) {
return NULL; return NULL;
} }

2
lib/libalpm/pkghash.c
View file

@ -304,8 +304,6 @@ pmpkg_t *_alpm_pkghash_find(pmpkghash_t *hash, const char *name)
unsigned long name_hash; unsigned long name_hash;
size_t position; size_t position;
ALPM_LOG_FUNC;
if(name == NULL || hash == NULL) { if(name == NULL || hash == NULL) {
return NULL; return NULL;
} }

14
lib/libalpm/remove.c
View file

@ -49,8 +49,6 @@ int SYMEXPORT alpm_remove_pkg(pmpkg_t *pkg)
pmtrans_t *trans; pmtrans_t *trans;
const char *pkgname; const char *pkgname;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
@ -74,8 +72,6 @@ int SYMEXPORT alpm_remove_pkg(pmpkg_t *pkg)
static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db, static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db,
alpm_list_t *lp) alpm_list_t *lp)
{ {
ALPM_LOG_FUNC;
while(lp) { while(lp) {
alpm_list_t *i; alpm_list_t *i;
for(i = lp; i; i = i->next) { for(i = lp; i; i = i->next) {
@ -101,8 +97,6 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db,
static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db, static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
alpm_list_t *lp) alpm_list_t *lp)
{ {
ALPM_LOG_FUNC;
/* Remove needed packages (which break dependencies) from target list */ /* Remove needed packages (which break dependencies) from target list */
while(lp != NULL) { while(lp != NULL) {
alpm_list_t *i; alpm_list_t *i;
@ -140,8 +134,6 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
{ {
alpm_list_t *lp; alpm_list_t *lp;
ALPM_LOG_FUNC;
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
@ -227,8 +219,6 @@ static void unlink_file(pmpkg_t *info, char *filename, alpm_list_t *skip_remove,
struct stat buf; struct stat buf;
char file[PATH_MAX+1]; char file[PATH_MAX+1];
ALPM_LOG_FUNC;
snprintf(file, PATH_MAX, "%s%s", handle->root, filename); snprintf(file, PATH_MAX, "%s%s", handle->root, filename);
/* check the remove skip list before removing the file. /* check the remove skip list before removing the file.
@ -297,8 +287,6 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg,
alpm_list_t *files = alpm_pkg_get_files(oldpkg); alpm_list_t *files = alpm_pkg_get_files(oldpkg);
const char *pkgname = alpm_pkg_get_name(oldpkg); const char *pkgname = alpm_pkg_get_name(oldpkg);
ALPM_LOG_FUNC;
_alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n",
oldpkg->name, oldpkg->version); oldpkg->name, oldpkg->version);
@ -367,8 +355,6 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
alpm_list_t *targ, *lp; alpm_list_t *targ, *lp;
size_t pkg_count; size_t pkg_count;
ALPM_LOG_FUNC;
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));

7
lib/libalpm/signing.c
View file

@ -111,8 +111,6 @@ static int gpgme_init(void)
gpgme_error_t err; gpgme_error_t err;
gpgme_engine_info_t enginfo; gpgme_engine_info_t enginfo;
ALPM_LOG_FUNC;
if(init) { if(init) {
/* we already successfully initialized the library */ /* we already successfully initialized the library */
return 0; return 0;
@ -213,8 +211,6 @@ int _alpm_gpgme_checksig(const char *path, const char *base64_sig)
unsigned char *decoded_sigdata = NULL; unsigned char *decoded_sigdata = NULL;
FILE *file = NULL, *sigfile = NULL; FILE *file = NULL, *sigfile = NULL;
ALPM_LOG_FUNC;
if(!path || access(path, R_OK) != 0) { if(!path || access(path, R_OK) != 0) {
RET_ERR(PM_ERR_NOT_A_FILE, -1); RET_ERR(PM_ERR_NOT_A_FILE, -1);
} }
@ -371,7 +367,6 @@ int _alpm_gpgme_checksig(const char *path, const char *base64_sig)
*/ */
pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db) pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, PM_PGP_VERIFY_UNKNOWN)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, PM_PGP_VERIFY_UNKNOWN));
if(db->pgp_verify != PM_PGP_VERIFY_UNKNOWN) { if(db->pgp_verify != PM_PGP_VERIFY_UNKNOWN) {
@ -388,7 +383,6 @@ pgp_verify_t _alpm_db_get_sigverify_level(pmdb_t *db)
*/ */
int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg) int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg)
{ {
ALPM_LOG_FUNC;
ASSERT(pkg != NULL, return 0); ASSERT(pkg != NULL, return 0);
return _alpm_gpgme_checksig(alpm_pkg_get_filename(pkg), pkg->base64_sig); return _alpm_gpgme_checksig(alpm_pkg_get_filename(pkg), pkg->base64_sig);
@ -401,7 +395,6 @@ int SYMEXPORT alpm_pkg_check_pgp_signature(pmpkg_t *pkg)
*/ */
int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db) int SYMEXPORT alpm_db_check_pgp_signature(pmdb_t *db)
{ {
ALPM_LOG_FUNC;
ASSERT(db != NULL, return 0); ASSERT(db != NULL, return 0);
return _alpm_gpgme_checksig(_alpm_db_path(db), NULL); return _alpm_gpgme_checksig(_alpm_db_path(db), NULL);

6
lib/libalpm/sync.c
View file

@ -89,8 +89,6 @@ int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade)
pmdb_t *db_local; pmdb_t *db_local;
alpm_list_t *dbs_sync; alpm_list_t *dbs_sync;
ALPM_LOG_FUNC;
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
trans = handle->trans; trans = handle->trans;
db_local = handle->db_local; db_local = handle->db_local;
@ -307,8 +305,6 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
alpm_list_t *remove = NULL; alpm_list_t *remove = NULL;
int ret = 0; int ret = 0;
ALPM_LOG_FUNC;
ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
@ -840,8 +836,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
size_t numtargs, current = 0, replaces = 0; size_t numtargs, current = 0, replaces = 0;
int errors; int errors;
ALPM_LOG_FUNC;
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
if(download_files(trans, &deltas)) { if(download_files(trans, &deltas)) {

16
lib/libalpm/trans.c
View file

@ -104,8 +104,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,
const int required_db_version = 2; const int required_db_version = 2;
int db_version; int db_version;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
@ -173,8 +171,6 @@ int SYMEXPORT alpm_trans_prepare(alpm_list_t **data)
{ {
pmtrans_t *trans; pmtrans_t *trans;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
@ -219,8 +215,6 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data)
{ {
pmtrans_t *trans; pmtrans_t *trans;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
@ -260,8 +254,6 @@ int SYMEXPORT alpm_trans_interrupt(void)
{ {
pmtrans_t *trans; pmtrans_t *trans;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
@ -280,8 +272,6 @@ int SYMEXPORT alpm_trans_release(void)
{ {
pmtrans_t *trans; pmtrans_t *trans;
ALPM_LOG_FUNC;
/* Sanity checks */ /* Sanity checks */
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
@ -313,8 +303,6 @@ pmtrans_t *_alpm_trans_new(void)
{ {
pmtrans_t *trans; pmtrans_t *trans;
ALPM_LOG_FUNC;
CALLOC(trans, 1, sizeof(pmtrans_t), RET_ERR(PM_ERR_MEMORY, NULL)); CALLOC(trans, 1, sizeof(pmtrans_t), RET_ERR(PM_ERR_MEMORY, NULL));
trans->state = STATE_IDLE; trans->state = STATE_IDLE;
@ -323,8 +311,6 @@ pmtrans_t *_alpm_trans_new(void)
void _alpm_trans_free(pmtrans_t *trans) void _alpm_trans_free(pmtrans_t *trans)
{ {
ALPM_LOG_FUNC;
if(trans == NULL) { if(trans == NULL) {
return; return;
} }
@ -377,8 +363,6 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
int clean_tmpdir = 0; int clean_tmpdir = 0;
int retval = 0; int retval = 0;
ALPM_LOG_FUNC;
if(access(installfn, R_OK)) { if(access(installfn, R_OK)) {
/* not found */ /* not found */
_alpm_log(PM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn); _alpm_log(PM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn);

6
lib/libalpm/util.c
View file

@ -252,8 +252,6 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int
char cwd[PATH_MAX]; char cwd[PATH_MAX];
int restore_cwd = 0; int restore_cwd = 0;
ALPM_LOG_FUNC;
if((_archive = archive_read_new()) == NULL) if((_archive = archive_read_new()) == NULL)
RET_ERR(PM_ERR_LIBARCHIVE, 1); RET_ERR(PM_ERR_LIBARCHIVE, 1);
@ -425,8 +423,6 @@ int _alpm_run_chroot(const char *root, const char *path, char *const argv[])
int restore_cwd = 0; int restore_cwd = 0;
int retval = 0; int retval = 0;
ALPM_LOG_FUNC;
/* save the cwd so we can restore it later */ /* save the cwd so we can restore it later */
if(getcwd(cwd, PATH_MAX) == NULL) { if(getcwd(cwd, PATH_MAX) == NULL) {
_alpm_log(PM_LOG_ERROR, _("could not get current working directory\n")); _alpm_log(PM_LOG_ERROR, _("could not get current working directory\n"));
@ -690,8 +686,6 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename)
char *md5sum; char *md5sum;
int ret, i; int ret, i;
ALPM_LOG_FUNC;
ASSERT(filename != NULL, return NULL); ASSERT(filename != NULL, return NULL);
/* allocate 32 chars plus 1 for null */ /* allocate 32 chars plus 1 for null */