From: Michael Schroeder Date: Tue, 10 Jan 2012 13:28:41 +0000 (+0100) Subject: - revert last commit now libzypp is fixed, make nkeys and nschemata signed (for consi... X-Git-Tag: BASE-SuSE-Code-12_2-Branch~212 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31b3b6e70b8129382c0830215de4ada3bbe454d5;p=platform%2Fupstream%2Flibsolv.git - revert last commit now libzypp is fixed, make nkeys and nschemata signed (for consistency) --- diff --git a/src/repodata.h b/src/repodata.h index f091206..1761550 100644 --- a/src/repodata.h +++ b/src/repodata.h @@ -60,11 +60,11 @@ typedef struct _Repodata { int error; /* corrupt solv file */ Repokey *keys; /* keys, first entry is always zero */ - unsigned int nkeys; /* length of keys array */ + int nkeys; /* length of keys array */ unsigned char keybits[32]; /* keyname hash */ Id *schemata; /* schema -> offset into schemadata */ - unsigned int nschemata; /* number of schemata */ + int nschemata; /* number of schemata */ Id *schemadata; /* schema storage */ unsigned int schemadatalen; /* schema storage size */ Id *schematahash; /* unification helper */ diff --git a/src/transaction.h b/src/transaction.h index 49518ad..2b55331 100644 --- a/src/transaction.h +++ b/src/transaction.h @@ -30,12 +30,11 @@ typedef struct _Transaction { Queue steps; /* the transaction steps */ - Map noobsmap; /* public for now */ - #ifdef LIBSOLV_INTERNAL Queue transaction_info; Id *transaction_installed; Map transactsmap; + Map noobsmap; struct _TransactionOrderdata *orderdata; #endif