Use Offset instead of unsigned int.

diff --git a/src/pool.c b/src/pool.c
index a34a496..771ad7a 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -250,11 +250,10 @@ void
 pool_prepare(Pool *pool)
 {
   int i, num, np, extra;
-  unsigned int n;
   Offset off;
   Solvable *s;
   Id id;
-  Offset *idp;
+  Offset *idp, n;
   Offset *whatprovides;
   Id *whatprovidesdata, *d;
 

diff --git a/src/poolid.c b/src/poolid.c
index 2a860cd..620bb6b 100644 (file)
--- a/src/poolid.c
+++ b/src/poolid.c
@@ -231,8 +231,6 @@ id2evr(Pool *pool, Id id)
   return pool->stringspace + pool->strings[rd->evr];
 }
 
-#define DEP2STRBUF 16
-
 const char *
 dep2str(Pool *pool, Id id)
 {

diff --git a/src/repo.c b/src/repo.c
index 218e2c0..90d016a 100644 (file)
--- a/src/repo.c
+++ b/src/repo.c
@@ -44,7 +44,7 @@ pool_addrepo_empty(Pool *pool)
  * 
  */
 
-unsigned int
+Offset
 repo_addid(Repo *repo, Offset olddeps, Id id)
 {
   Id *idarray;
@@ -108,7 +108,7 @@ repo_addid(Repo *repo, Offset olddeps, Id id)
  * 
  */
 
-unsigned int
+Offset
 repo_addid_dep(Repo *repo, Offset olddeps, Id id, int isreq)
 {
   Id oid, *oidp, *marker = 0;
@@ -175,8 +175,8 @@ repo_addid_dep(Repo *repo, Offset olddeps, Id id, int isreq)
  * make space for 'num' more dependencies
  */
 
-unsigned int
-repo_reserve_ids(Repo *repo, unsigned int olddeps, int num)
+Offset
+repo_reserve_ids(Repo *repo, Offset olddeps, int num)
 {
   num++;       /* room for trailing ID_NULL */
 
@@ -272,8 +272,8 @@ pool_freerepo(Pool *pool, Repo *repo)
   xfree(repo);
 }
 
-unsigned int
-repo_fix_legacy(Repo *repo, unsigned int provides, unsigned int supplements)
+Offset
+repo_fix_legacy(Repo *repo, Offset provides, Offset supplements)
 {
   Pool *pool = repo->pool;
   Id id, idp, idl, idns;

diff --git a/src/repo.h b/src/repo.h
index c0040a3..cf825b8 100644 (file)
--- a/src/repo.h
+++ b/src/repo.h
@@ -23,10 +23,10 @@ typedef struct _Repo {
   Id *rpmdbid;
 } Repo;
 
-extern unsigned int repo_addid(Repo *repo, unsigned int olddeps, Id id);
-extern unsigned int repo_addid_dep(Repo *repo, unsigned int olddeps, Id id, int isreq);
-extern unsigned int repo_reserve_ids(Repo *repo, unsigned int olddeps, int num);
-extern unsigned int repo_fix_legacy(Repo *repo, unsigned int provides, unsigned int supplements);
+extern Offset repo_addid(Repo *repo, Offset olddeps, Id id);
+extern Offset repo_addid_dep(Repo *repo, Offset olddeps, Id id, int isreq);
+extern Offset repo_reserve_ids(Repo *repo, Offset olddeps, int num);
+extern Offset repo_fix_legacy(Repo *repo, Offset provides, Offset supplements);
 
 extern Repo *pool_addrepo_empty(Pool *pool);
 extern void pool_freerepo(Pool *pool, Repo *repo);