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:59:00 Branch: rpm-5_3 Handle: 2011050315585901 Modified files: (Branch: rpm-5_3) rpm/lib rpmts.h rpm/rpmdb rpmns.h rpmtypes.h rpm/rpmio rpmiotypes.h Log: fix compile warning with -pedantic about comma at end of enumerator list Summary: Revision Changes Path 2.130.2.4 +2 -2 rpm/lib/rpmts.h 1.4.4.1 +1 -1 rpm/rpmdb/rpmns.h 1.5.2.2 +1 -1 rpm/rpmdb/rpmtypes.h 1.46.2.1 +2 -2 rpm/rpmio/rpmiotypes.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/rpmts.h ============================================================================ $ cvs diff -u -r2.130.2.3 -r2.130.2.4 rpmts.h --- rpm/lib/rpmts.h 1 Oct 2010 20:22:50 -0000 2.130.2.3 +++ rpm/lib/rpmts.h 3 May 2011 15:58:59 -0000 2.130.2.4 @@ -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 -r1.4.4.1 rpmns.h --- rpm/rpmdb/rpmns.h 17 Jan 2009 23:02:43 -0000 1.4 +++ rpm/rpmdb/rpmns.h 3 May 2011 15:58:59 -0000 1.4.4.1 @@ -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.5.2.1 -r1.5.2.2 rpmtypes.h --- rpm/rpmdb/rpmtypes.h 16 Oct 2010 01:48:33 -0000 1.5.2.1 +++ rpm/rpmdb/rpmtypes.h 3 May 2011 15:58:59 -0000 1.5.2.2 @@ -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; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmiotypes.h ============================================================================ $ cvs diff -u -r1.46 -r1.46.2.1 rpmiotypes.h --- rpm/rpmio/rpmiotypes.h 24 Dec 2009 16:23:50 -0000 1.46 +++ rpm/rpmio/rpmiotypes.h 3 May 2011 15:59:00 -0000 1.46.2.1 @@ -308,7 +308,7 @@ PGPHASHALGO_HAMSI_224 = 248+0,/*!< (private) HAMSI-224 */ PGPHASHALGO_HAMSI_256 = 248+1,/*!< (private) HAMSI-256 */ PGPHASHALGO_HAMSI_384 = 248+2,/*!< (private) HAMSI-384 */ - PGPHASHALGO_HAMSI_512 = 248+3,/*!< (private) HAMSI-512 */ + PGPHASHALGO_HAMSI_512 = 248+3/*!< (private) HAMSI-512 */ } pgpHashAlgo; @@ -316,7 +316,7 @@ * Bit(s) to control digest operation. */ typedef enum rpmDigestFlags_e { - RPMDIGEST_NONE = 0, + RPMDIGEST_NONE = 0 } rpmDigestFlags; #if defined(_RPMIOB_INTERNAL) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org