RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 04-Dec-2009 05:12:27 Branch: HEAD Handle: 2009120404122700 Modified files: rpm/rpmdb header.c Log: - return oinstance from headerSetInstance(). - use headerGetInstance() consistently. Summary: Revision Changes Path 1.193 +6 -3 rpm/rpmdb/header.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmdb/header.c ============================================================================ $ cvs diff -u -r1.192 -r1.193 header.c --- rpm/rpmdb/header.c 1 Jun 2009 20:35:02 -0000 1.192 +++ rpm/rpmdb/header.c 4 Dec 2009 04:12:27 -0000 1.193 @@ -1244,9 +1244,12 @@ rpmuint32_t headerSetInstance(Header h, rpmuint32_t instance) { - if (h != NULL) + uint32_t oinstance = 0; + if (h != NULL) { + oinstance = h->instance; h->instance = instance; - return 0; + } + return oinstance; } rpmuint32_t headerGetStartOff(Header h) @@ -1283,7 +1286,7 @@ const char * digest = (h->digest != NULL ? xstrdup(h->digest) : NULL); struct stat sb = h->sb; /* structure assignment */ void * rpmdb = h->rpmdb; - rpmuint32_t instance = h->instance; + rpmuint32_t instance = headerGetInstance(h); int xx; /*...@-onlytrans@*/ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
