[Frugalware-git] pacman-g2: libpacman: Pass the handle instead of passing root and dbpath when creating a db.

[Michel Hermier]

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

commit a8403005ef69fa678259ecd36c8557ec6c5ccf3c
Author: Michel Hermier <herm...@frugalware.org>
Date:   Fri Nov 15 01:27:24 2013 +0100

libpacman: Pass the handle instead of passing root and dbpath when creating a 
db.

diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index 457274a..2f87335 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -66,7 +66,7 @@ FILE *_pacman_db_fopen_lastupdate(const pmdb_t *db, const 
char *mode)
return fopen(path, mode);
}

-pmdb_t *_pacman_db_new(const char *root, const char* dbpath, const char 
*treename)
+pmdb_t *_pacman_db_new(pmhandle_t *handle, const char *treename)
{
pmdb_t *db = _pacman_zalloc(sizeof(pmdb_t));

@@ -74,12 +74,12 @@ pmdb_t *_pacman_db_new(const char *root, const char* 
dbpath, const char *treenam
return(NULL);
}

-       db->path = 
_pacman_malloc(strlen(root)+strlen(dbpath)+strlen(treename)+2);
+       db->path = 
_pacman_malloc(strlen(handle->root)+strlen(handle->dbpath)+strlen(treename)+2);
if(db->path == NULL) {
FREE(db);
return(NULL);
}
-       sprintf(db->path, "%s%s/%s", root, dbpath, treename);
+       sprintf(db->path, "%s%s/%s", handle->root, handle->dbpath, treename);

STRNCPY(db->treename, treename, PATH_MAX);

@@ -364,7 +364,7 @@ pmdb_t *_pacman_db_register(const char *treename, 
pacman_cb_db_register callback

_pacman_log(PM_LOG_FLOW1, _("registering database '%s'"), treename);

-       db = _pacman_db_new(handle->root, handle->dbpath, treename);
+       db = _pacman_db_new(handle, treename);
if(db == NULL) {
RET_ERR(PM_ERR_DB_CREATE, NULL);
}
diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h
index 397a6f3..2b6e28a 100644
--- a/lib/libpacman/db.h
+++ b/lib/libpacman/db.h
@@ -26,7 +26,7 @@
#include <limits.h>
#include <time.h>

-#include "pacman.h"
+#include "handle.h"

/* Database entries */
#define INFRQ_NONE     0x00
@@ -68,7 +68,7 @@ struct __pmdb_t {
char lastupdate[16];
};

-pmdb_t *_pacman_db_new(const char *root, const char *dbpath, const char 
*treename);
+pmdb_t *_pacman_db_new(pmhandle_t *handle, const char *treename);
void _pacman_db_free(void *data);
int _pacman_db_cmp(const void *db1, const void *db2);
pmlist_t *_pacman_db_search(pmdb_t *db, pmlist_t *needles);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git