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

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   20-Jan-2008 12:05:34
  Branch: HEAD                             Handle: 2008012011053400

  Modified files:
    rpm                     CHANGES
    rpm/rpmconstant         constant.c

  Log:
    Make older C compiler happy by not declaring a variable in the middle of a 
block in rpmconstant/constant.c
    
    Submitted by: Peter Kalbus <[EMAIL PROTECTED]>

  Summary:
    Revision    Changes     Path
    1.2083      +1  -0      rpm/CHANGES
    1.7         +2  -2      rpm/rpmconstant/constant.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2082 -r1.2083 CHANGES
  --- rpm/CHANGES       20 Jan 2008 10:32:35 -0000      1.2082
  +++ rpm/CHANGES       20 Jan 2008 11:05:34 -0000      1.2083
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - rse: make older C compiler happy by not declaring a variable in the 
middle of a block in rpmconstant/constant.c
       - rse: let RPM Lua init procedure load all init scripts configured with 
new Autoconf option --with-path-rpmlua 
       - rse: fix Autoconf procedure by running python(1) based checks only 
under --with-python
       - rse: provide RPM Lua function rpm.realpath(<path>) to complement RPM 
macro %{realpath:<path>}
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmconstant/constant.c
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 constant.c
  --- rpm/rpmconstant/constant.c        4 Oct 2007 07:20:43 -0000       1.6
  +++ rpm/rpmconstant/constant.c        20 Jan 2008 11:05:34 -0000      1.7
  @@ -1,5 +1,5 @@
   /* Nanar <[EMAIL PROTECTED]>
  - * $Id: constant.c,v 1.6 2007/10/04 07:20:43 rse Exp $
  + * $Id: constant.c,v 1.7 2008/01/20 11:05:34 rse Exp $
    */
   
   #include "system.h"
  @@ -69,8 +69,8 @@
           if (qmode & QMODE_REVERSE) {
               if(sscanf(name, "%d", &token)) {
                   if (qmode & QMODE_SET) {
  -                    printf("%d:", token);
                       int i = 0;
  +                    printf("%d:", token);
                       while ((val = rpmconstantFindMask(context, token, (void 
*) &name, showprefix))) {
                           printf(" %s", name);
                           token &= ~val;
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to