[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_4: rpm/rpmdb/ rpmdb.c
From:       "Per ?yvind Karlsen" <pkarlsen () rpm5 ! org>
Date:       2011-11-07 15:33:01
Message-ID: 20111107153301.936CC8FE49 () rpm5 ! org
[Download RAW message or body]

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

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   07-Nov-2011 16:33:01
  Branch: rpm-5_4                          Handle: 2011110715330100

  Modified files:           (Branch: rpm-5_4)
    rpm/rpmdb               rpmdb.c

  Log:
    use xrealloc() & move tmp++ out of for statement

  Summary:
    Revision    Changes     Path
    1.392.2.9   +4  -2      rpm/rpmdb/rpmdb.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  ============================================================================
  $ cvs diff -u -r1.392.2.8 -r1.392.2.9 rpmdb.c
  --- rpm/rpmdb/rpmdb.c	2 Nov 2011 13:51:38 -0000	1.392.2.8
  +++ rpm/rpmdb/rpmdb.c	7 Nov 2011 15:33:01 -0000	1.392.2.9
  @@ -2466,7 +2466,9 @@
   
   	    /* If pattern has less than three '-', it can't contain disttag, so
   	     * no point in trying */
  -	    for (i = 0; (tmp = strchr(tmp, '-')); i++, tmp++);
  +	    for (i = 0; (tmp = strchr(tmp, '-')); i++)
  +		tmp++;
  +
   	    if (i >= 3) {
   		dbiIndex pdbi;
   		DBC *pdbc;
  @@ -2526,7 +2528,7 @@
   		}
   		if(set && set->count != size) {
   		    set->count = size;
  -		    set->recs = realloc(set->recs, size * sizeof(*set->recs));
  +		    set->recs = xrealloc(set->recs, size * sizeof(*set->recs));
   		}
   
   		xx = dbiCclose(pdbi, pdbc, 0);
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]