Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d495842ab23edca169b8c1264f601285f10ef402
commit d495842ab23edca169b8c1264f601285f10ef402
Author: Michel Hermier <herm...@frugalware.org>
Date: Wed Oct 30 13:04:55 2013 +0100
libpacman: Make pmpkg_t public, should be used instead of PM_PKG in new code.
diff --git a/doc/libpacman-changes.txt b/doc/libpacman-changes.txt
index e40e3b1..a713ce7 100644
--- a/doc/libpacman-changes.txt
+++ b/doc/libpacman-changes.txt
@@ -24,6 +24,7 @@ pacman_trans_cb_progress: Second argument (pkgname) is now a
const.
==== Symbols added:
pmdb_t: is now public and deprecate PM_DB.
+pmpkg_t: is now public and deprecate PM_PKG.
==== Symbols removed:
diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h
index 54f8c09..cff1698 100644
--- a/lib/libpacman/package.h
+++ b/lib/libpacman/package.h
@@ -29,6 +29,7 @@
#include <time.h>
#endif
#include "list.h"
+#include "pacman.h"
enum {
PKG_FROM_CACHE = 1,
@@ -47,7 +48,7 @@ enum {
#define PKG_SHA1SUM_LEN 41
#define PKG_ARCH_LEN 32
-typedef struct __pmpkg_t {
+struct __pmpkg_t {
char name[PKG_NAME_LEN];
char version[PKG_VERSION_LEN];
char desc[PKG_DESC_LEN];
@@ -81,7 +82,7 @@ typedef struct __pmpkg_t {
unsigned char origin;
void *data;
unsigned char infolevel;
-} pmpkg_t;
+};
#define FREEPKG(p) \
do { \
diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h
index 825c52a..54ea7ba 100644
--- a/lib/libpacman/pacman.h
+++ b/lib/libpacman/pacman.h
@@ -47,6 +47,7 @@ extern "C" {
*/
typedef struct __pmdb_t pmdb_t;
+typedef struct __pmpkg_t pmpkg_t;
/* Compatibility definitions */
typedef struct __pmlist_t PM_LIST;
@@ -154,7 +155,7 @@ int pacman_db_setserver(pmdb_t *db, char *url);
int pacman_db_update(int level, pmdb_t *db);
-PM_PKG *pacman_db_readpkg(pmdb_t *db, const char *name);
+pmpkg_t *pacman_db_readpkg(pmdb_t *db, const char *name);
PM_LIST *pacman_db_getpkgcache(pmdb_t *db);
PM_LIST *pacman_db_whatprovides(pmdb_t *db, char *name);
@@ -212,10 +213,10 @@ enum {
#define PM_PKG_WITHOUT_ARCH 0 /* pkgname-pkgver-pkgrel, used under PM_DBPATH */
#define PM_PKG_WITH_ARCH 1 /* ie, pkgname-pkgver-pkgrel-arch, used under
PM_CACHEDIR */
-void *pacman_pkg_getinfo(PM_PKG *pkg, unsigned char parm);
+void *pacman_pkg_getinfo(pmpkg_t *pkg, unsigned char parm);
PM_LIST *pacman_pkg_getowners(char *filename);
-int pacman_pkg_load(char *filename, PM_PKG **pkg);
-int pacman_pkg_free(PM_PKG *pkg);
+int pacman_pkg_load(char *filename, pmpkg_t **pkg);
+int pacman_pkg_free(pmpkg_t *pkg);
char *pacman_fetch_pkgurl(char *url);
int pacman_parse_config(char *file, pacman_cb_db_register callback, const char
*this_section);
int pacman_pkg_vercmp(const char *ver1, const char *ver2);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
