Seriously you have better things to do than diddle w commas and -pedantic. If not, well mdawkins has a reproducer with --xml due to my --json changes that could/should be brought back to rpm-5.3.x.
Just a reality check ... 73 de Jeff On May 3, 2011, at 11:58 AM, Per Øyvind Karlsen wrote: > RPM Package Manager, CVS Repository > http://rpm5.org/cvs/ > ____________________________________________________________________________ > > Server: rpm5.org Name: Per Øyvind Karlsen > Root: /v/rpm/cvs Email: pkarl...@rpm5.org > Module: rpm Date: 03-May-2011 17:58:19 > Branch: rpm-5_4 Handle: 2011050315581900 > > Modified files: (Branch: rpm-5_4) > rpm/lib rpmts.h > rpm/rpmdb rpmns.h rpmtypes.h > > Log: > fix compile warning with -pedantic about comma at end of enumerator > list > > Summary: > Revision Changes Path > 2.134.2.1 +2 -2 rpm/lib/rpmts.h > 1.4.6.2 +1 -1 rpm/rpmdb/rpmns.h > 1.6.2.1 +1 -1 rpm/rpmdb/rpmtypes.h > ____________________________________________________________________________ > > patch -p0 <<'@@ .' > Index: rpm/lib/rpmts.h > ============================================================================ > $ cvs diff -u -r2.134 -r2.134.2.1 rpmts.h > --- rpm/lib/rpmts.h 1 Oct 2010 20:21:48 -0000 2.134 > +++ rpm/lib/rpmts.h 3 May 2011 15:58:19 -0000 2.134.2.1 > @@ -91,7 +91,7 @@ > RPMTRANS_FLAG_NOFDIGESTS = (1 << 27), /*!< from --nofdigests > */ > RPMTRANS_FLAG_NOPRETRANS = (1 << 28), /*!< from --nopretrans > */ > RPMTRANS_FLAG_NOPOSTTRANS = (1 << 29), /*!< from --noposttrans > */ > - RPMTRANS_FLAG_NOCONFIGS = (1 << 30), /*!< from --noconfigs */ > + RPMTRANS_FLAG_NOCONFIGS = (1 << 30) /*!< from --noconfigs */ > /* 31 unused */ > } rpmtransFlags; > > @@ -153,7 +153,7 @@ > typedef enum tsStage_e { > TSM_UNKNOWN = 0, > TSM_INSTALL = 7, > - TSM_ERASE = 8, > + TSM_ERASE = 8 > } tsmStage; > > #if defined(_RPMTS_INTERNAL) > @@ . > patch -p0 <<'@@ .' > Index: rpm/rpmdb/rpmns.h > ============================================================================ > $ cvs diff -u -r1.4.6.1 -r1.4.6.2 rpmns.h > --- rpm/rpmdb/rpmns.h 3 Jan 2011 21:21:38 -0000 1.4.6.1 > +++ rpm/rpmdb/rpmns.h 3 May 2011 15:58:19 -0000 1.4.6.2 > @@ -52,7 +52,7 @@ > RPMNS_TYPE_VCHECK = (1 << 26), /*!< vcheck(foo) */ > RPMNS_TYPE_SIGNATURE= (1 << 27), /*!< signature(/text:/sig) = > /pub:id */ > RPMNS_TYPE_VERIFY = (1 << 28), /*!< verify(N) = E:V-R */ > - RPMNS_TYPE_CONFIG = (1 << 29), /*!< config(N) = E:V-R */ > + RPMNS_TYPE_CONFIG = (1 << 29) /*!< config(N) = E:V-R */ > } nsType; > > #if defined(_RPMNS_INTERNAL) > @@ . > patch -p0 <<'@@ .' > Index: rpm/rpmdb/rpmtypes.h > ============================================================================ > $ cvs diff -u -r1.6 -r1.6.2.1 rpmtypes.h > --- rpm/rpmdb/rpmtypes.h 16 Oct 2010 01:47:39 -0000 1.6 > +++ rpm/rpmdb/rpmtypes.h 3 May 2011 15:58:19 -0000 1.6.2.1 > @@ -92,7 +92,7 @@ > RPMSCRIPT_STATE_REAPED = (1 << 17), /*!< scriptlet was reaped */ > /* 18-23 unused */ > RPMSCRIPT_STATE_SELINUX = (1 << 24), /*!< scriptlet exec by SELinux */ > - RPMSCRIPT_STATE_EMBEDDED = (1 << 25), /*!< scriptlet exec by lua > et al */ > + RPMSCRIPT_STATE_EMBEDDED = (1 << 25) /*!< scriptlet exec by lua > et al */ > /* 26-31 unused */ > } rpmScriptState; > > @@ . > ______________________________________________________________________ > RPM Package Manager http://rpm5.org > CVS Sources Repository rpm-...@rpm5.org
smime.p7s
Description: S/MIME cryptographic signature
