RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   12-Aug-2010 20:57:09
  Branch: HEAD                             Handle: 2010081218570900

  Modified files:
    rpm/build               files.c

  Log:
    - don't bother w qsort if there's only a single file in the list.
    - fix: valgrind in rhel6 is pickier.

  Summary:
    Revision    Changes     Path
    1.368       +7  -2      rpm/build/files.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/build/files.c
  ============================================================================
  $ cvs diff -u -r1.367 -r1.368 files.c
  --- rpm/build/files.c	6 Mar 2010 03:31:19 -0000	1.367
  +++ rpm/build/files.c	12 Aug 2010 18:57:09 -0000	1.368
  @@ -1350,9 +1350,12 @@
       char buf[BUFSIZ];
       int i, xx;
   
  +memset(buf, 0, sizeof(buf));	/* XXX valgrind on rhel6 beta pickier */
  +
       /* Sort the big list */
  -    qsort(fl->fileList, fl->fileListRecsUsed,
  -	  sizeof(*(fl->fileList)), compareFileListRecs);
  +    if (fl->fileListRecsUsed > 1)
  +	qsort(fl->fileList, fl->fileListRecsUsed,
  +		sizeof(*(fl->fileList)), compareFileListRecs);
       
       /* Generate the header. */
       if (! isSrc) {
  @@ -2502,6 +2505,7 @@
   	(void) rpmlibNeedsFeature(pkg->header,
   			"PartialHardlinkSets", "4.0.4-1");
   
  +    /* XXX should tags be added if filelist is empty? */
       genCpioListAndHeader(&fl, &pkg->fi, pkg->header, 0);
   
       if (spec->timeCheck)
  @@ -2815,6 +2819,7 @@
       if (rc)
   	goto exit;
   
  +    /* XXX should tags be added if filelist is empty? */
       spec->fi = NULL;
       genCpioListAndHeader(&fl, &spec->fi, spec->sourceHeader, 1);
   
  @@ .