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:   28-Dec-2007 02:50:11
  Branch: HEAD                             Handle: 2007122801501100

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               macro.c

  Log:
    - jbj: simplify expandFIFO().

  Summary:
    Revision    Changes     Path
    1.2028      +1  -0      rpm/CHANGES
    2.165       +3  -5      rpm/rpmio/macro.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2027 -r1.2028 CHANGES
  --- rpm/CHANGES	28 Dec 2007 01:37:35 -0000	1.2027
  +++ rpm/CHANGES	28 Dec 2007 01:50:11 -0000	1.2028
  @@ -1,4 +1,5 @@
   5.0b3 -> 5.0b4:
  +    - jbj: simplify expandFIFO().
       - jbj: use "\n", not ",", as the default for %@foo expansion.
       - jbj: fixup %{@foo:, } per rse comments.
       - jbj: convert %{@foo:|} to "foo|bar|quux" tuple. %@foo assumes CSV comma.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.164 -r2.165 macro.c
  --- rpm/rpmio/macro.c	28 Dec 2007 01:37:35 -0000	2.164
  +++ rpm/rpmio/macro.c	28 Dec 2007 01:50:11 -0000	2.165
  @@ -1309,12 +1309,10 @@
   {
       int rc = 0;
   
  -    if (me->prev == NULL)
  -	return rc;
  -
  -    expandFIFO(mb, me->prev, g, gn);
  -    if (me->prev->prev)
  +    if (me && me->prev && me->prev->prev) {
  +	rc = expandFIFO(mb, me->prev, g, gn);
   	rc = expandT(mb, g, gn);
  +    }
       return expandT(mb, me->body, strlen(me->body));
   }
   
  @@ .