RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  devzero2...@rpm5.org
  Module: rpm                              Date:   09-Dec-2009 17:02:44
  Branch: HEAD                             Handle: 2009120916024400

  Modified files:
    rpm/lib                 rpminstall.c tgi.c

  Log:
    try to use rpmmiInstance consistently with uint32_t for the return
    data type and hdrNum.

  Summary:
    Revision    Changes     Path
    1.222       +2  -2      rpm/lib/rpminstall.c
    2.27        +2  -2      rpm/lib/tgi.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpminstall.c
  ============================================================================
  $ cvs diff -u -r1.221 -r1.222 rpminstall.c
  --- rpm/lib/rpminstall.c      8 Dec 2009 13:25:05 -0000       1.221
  +++ rpm/lib/rpminstall.c      9 Dec 2009 16:02:44 -0000       1.222
  @@ -343,9 +343,9 @@
        return RPMRC_NOTFOUND;
   
       while ((h = rpmmiNext(mi)) != NULL) {
  -     unsigned int recOffset = rpmmiInstance(mi);
  +     uint32_t hdrNum = rpmmiInstance(mi);
   
  -     if (recOffset == 0) {   /* XXX can't happen. */
  +     if (hdrNum == 0) {      /* XXX can't happen. */
            rc = RPMRC_FAIL;
            break;
        }
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/tgi.c
  ============================================================================
  $ cvs diff -u -r2.26 -r2.27 tgi.c
  --- rpm/lib/tgi.c     15 May 2009 13:40:58 -0000      2.26
  +++ rpm/lib/tgi.c     9 Dec 2009 16:02:44 -0000       2.27
  @@ -59,9 +59,9 @@
        return RPMRC_NOTFOUND;
   
       while ((h = rpmmiNext(mi)) != NULL) {
  -     unsigned int recOffset = rpmmiInstance(mi);
  +     uint32_t hdrNum = rpmmiInstance(mi);
   
  -     if (recOffset == 0) {   /* XXX can't happen. */
  +     if (hdrNum == 0) {      /* XXX can't happen. */
            rc = RPMRC_FAIL;
            break;
        }
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to