RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/lib/ rpmfc.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Sat 22 Sep 2007 - 22:37:17 CEST
Message-Id: <20070922203717.23CAA34845E@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   22-Sep-2007 22:37:17
  Branch: HEAD                             Handle: 2007092221371600

  Modified files:
    rpm/lib                 rpmfc.c

  Log:
    remove duplicate call.

  Summary:
    Revision    Changes     Path
    1.16        +1  -3      rpm/lib/rpmfc.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmfc.c
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 rpmfc.c
  --- rpm/lib/rpmfc.c	1 Aug 2007 19:35:04 -0000	1.15
  +++ rpm/lib/rpmfc.c	22 Sep 2007 20:37:16 -0000	1.16
  @@ -997,6 +997,7 @@
       if (magicfile == NULL || *magicfile == '\0')
   	magicfile = _free(magicfile);
       mg = rpmmgNew(magicfile, 0);
  +assert(mg);	/* XXX figger a proper return path. */
   
       fc->nfiles = argvCount(argv);
   
  @@ -1008,9 +1009,6 @@
       xx = argvAdd(&fc->cdict, "");
       xx = argvAdd(&fc->cdict, "directory");
   
  -    mg = rpmmgNew(magicfile, 0);
  -assert(mg);	/* XXX figger a proper return path. */
  -
       for (fc->ix = 0; fc->ix < fc->nfiles; fc->ix++) {
   	const char * ftype;
   	int freeftype;
  @@ .
Received on Sat Sep 22 22:37:17 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.