[Frugalware-git] pacman-g2: libpacman: Code style and warning fixes.

[Michel Hermier]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0bf264f98debfcb75e47aef48f7a68e7930ae699

commit 0bf264f98debfcb75e47aef48f7a68e7930ae699
Author: Michel Hermier <herm...@frugalware.org>
Date:   Tue Nov 12 14:31:24 2013 +0100

libpacman: Code style and warning fixes.

diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c
index 0a4408e..5b044f1 100644
--- a/lib/libpacman/cache.c
+++ b/lib/libpacman/cache.c
@@ -51,9 +51,7 @@ int _pacman_db_load_pkgcache(pmdb_t *db)
{
pmpkg_t *info;

-       if(db == NULL) {
-               return(-1);
-       }
+       ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));

_pacman_db_free_pkgcache(db);

@@ -76,7 +74,8 @@ int _pacman_db_load_pkgcache(pmdb_t *db)

void _pacman_db_free_pkgcache(pmdb_t *db)
{
-       if(db == NULL || db->pkgcache == NULL) {
+       ASSERT(db != NULL, pm_errno = PM_ERR_DB_NULL; return);
+       if(db->pkgcache == NULL) {
return;
}

diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index af881a1..c4b0851 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -186,6 +186,7 @@ int _pacman_db_close(pmdb_t *db)
int _pacman_db_gettimestamp(pmdb_t *db, struct tm *timestamp)
{
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
+       ASSERT(timestamp != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));

if(db->ops->gettimestamp) {
return db->ops->gettimestamp(db, timestamp);
@@ -329,7 +330,6 @@ int _pacman_db_setlastupdate(pmdb_t *db, const char *ts)
return(-1);
}
fclose(fp);
-
return(0);
}

@@ -390,7 +390,6 @@ pmdb_t *_pacman_db_register(const char *treename, 
pacman_cb_db_register callback
} else {
handle->dbs_sync = _pacman_list_add(handle->dbs_sync, db);
}
-
return(db);
}
/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libpacman/db/syncdb.c b/lib/libpacman/db/syncdb.c
index bf57b27..bc86ce7 100644
--- a/lib/libpacman/db/syncdb.c
+++ b/lib/libpacman/db/syncdb.c
@@ -71,7 +71,7 @@ pmpkg_t *_pacman_syncdb_pkg_new(pmdb_t *db, const struct 
archive_entry *entry, u
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL));
ASSERT(entry != NULL, return NULL);

-       dname = archive_entry_pathname(entry);
+       dname = archive_entry_pathname((struct archive_entry *)entry);
if((pkg = _pacman_pkg_new_from_filename(dname, 0)) == NULL ||
_pacman_db_read(db, inforeq, pkg) == -1) {
_pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname);
diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c
index 1c6a42e..5c5cd36 100644
--- a/lib/libpacman/util.c
+++ b/lib/libpacman/util.c
@@ -58,6 +58,7 @@
/* pacman-g2 */
#include "util.h"

+#include "io/archive.h"
#include "util/list.h"
#include "util/log.h"
#include "trans.h"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git