[CVS] RPM: popt/ poptconfig.c

[Pinto Elia]

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

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  devzero2...@rpm5.org
  Module: popt                             Date:   23-Jul-2010 15:18:00
  Branch: HEAD                             Handle: 2010072313175900

  Modified files:
    popt                    poptconfig.c

  Log:
    use x=_free(x) (the jbj transform) consistently

  Summary:
    Revision    Changes     Path
    1.52        +10 -19     popt/poptconfig.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: popt/poptconfig.c
  ============================================================================
  $ cvs diff -u -r1.51 -r1.52 poptconfig.c
  --- popt/poptconfig.c 20 May 2009 13:18:07 -0000      1.51
  +++ popt/poptconfig.c 23 Jul 2010 13:17:59 -0000      1.52
  @@ -211,10 +211,8 @@
   exit:
       if (rc != 0) {
   /*...@-usedef@*/
  -     if (b)
  -         free(b);
  +     b=_free(b);
   /*...@=usedef@*/
  -     b = NULL;
        nb = 0;
       }
       if (bp)
  @@ -383,8 +381,7 @@
   /*...@=nullstate@*/
   exit:
       rc = 0;  /* XXX for now, always return success */
  -    if (b)
  -     free(b);
  +    b=_free(b);
       return rc;
   }
   /*...@=compmempass@*/
  @@ -433,12 +430,11 @@
        }
       }
   
  -    free(t);
  +    t=_free(t);
       rc = 0;
   
   exit:
  -    if (b)
  -     free(b);
  +     b=_free(b);
       return rc;
   }
   
  @@ -481,16 +477,13 @@
            xx = poptReadConfigFile(con, fn);
            if (xx && rc == 0)
                rc = xx;
  -         free((void *)av[i]);
  -         av[i] = NULL;
  +         av[i]=_free((void *)av[i]);
        }
  -     free(av);
  -     av = NULL;
  +     av=_free(av);
       }
   
   /*...@-usedef@*/
  -    if (buf)
  -     free(buf);
  +    buf=_free(buf);
   /*...@=usedef@*/
   
       return rc;
  @@ -530,11 +523,9 @@
                        continue;
                }
                rc = poptReadConfigFile(con, fn);
  -             free((void *)av[i]);
  -             av[i] = NULL;
  +             av[i]=_free((void *)av[i]);
            }
  -         free(av);
  -         av = NULL;
  +         av=_free(av);
        }
       }
       if (rc) goto exit;
  @@ -545,7 +536,7 @@
        if (fn != NULL) {
            (void) stpcpy(stpcpy(fn, home), "/.popt");
            rc = poptReadConfigFile(con, fn);
  -         free(fn);
  +         fn=_free(fn);
        } else
            rc = POPT_ERROR_ERRNO;
        if (rc) goto exit;
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org