Author: mlschroe Date: Mon Oct 29 18:25:45 2007 New Revision: 7694 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7694&view=rev Log: Use Offset instead of unsigned int. Modified: trunk/sat-solver/src/pool.c trunk/sat-solver/src/poolid.c trunk/sat-solver/src/repo.c trunk/sat-solver/src/repo.h Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=7694&r1=7693&r2=7694&view=diff ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Mon Oct 29 18:25:45 2007 @@ -250,11 +250,10 @@ 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; Modified: trunk/sat-solver/src/poolid.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/poolid.c?rev=7694&r1=7693&r2=7694&view=diff ============================================================================== --- trunk/sat-solver/src/poolid.c (original) +++ trunk/sat-solver/src/poolid.c Mon Oct 29 18:25:45 2007 @@ -231,8 +231,6 @@ return pool->stringspace + pool->strings[rd->evr]; } -#define DEP2STRBUF 16 - const char * dep2str(Pool *pool, Id id) { Modified: trunk/sat-solver/src/repo.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.c?rev=7694&r1=7693&r2=7694&view=diff ============================================================================== --- trunk/sat-solver/src/repo.c (original) +++ trunk/sat-solver/src/repo.c Mon Oct 29 18:25:45 2007 @@ -44,7 +44,7 @@ * */ -unsigned int +Offset repo_addid(Repo *repo, Offset olddeps, Id id) { Id *idarray; @@ -108,7 +108,7 @@ * */ -unsigned int +Offset repo_addid_dep(Repo *repo, Offset olddeps, Id id, int isreq) { Id oid, *oidp, *marker = 0; @@ -175,8 +175,8 @@ * 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 @@ 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; Modified: trunk/sat-solver/src/repo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.h?rev=7694&r1=7693&r2=7694&view=diff ============================================================================== --- trunk/sat-solver/src/repo.h (original) +++ trunk/sat-solver/src/repo.h Mon Oct 29 18:25:45 2007 @@ -23,10 +23,10 @@ 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); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org