RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 18-Oct-2010 09:56:13
Branch: HEAD Handle: 2010101807561300
Modified files:
rpm/rpmio lane.c luffa.c shavite3.c simd.c
Log:
- remove compiler warnings
Summary:
Revision Changes Path
2.7 +5 -5 rpm/rpmio/lane.c
2.6 +5 -5 rpm/rpmio/luffa.c
2.3 +7 -5 rpm/rpmio/shavite3.c
2.5 +6 -6 rpm/rpmio/simd.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/lane.c
============================================================================
$ cvs diff -u -r2.6 -r2.7 lane.c
--- rpm/rpmio/lane.c 6 Dec 2009 16:40:02 -0000 2.6
+++ rpm/rpmio/lane.c 18 Oct 2010 07:56:13 -0000 2.7
@@ -36,15 +36,15 @@
#define MSB32(x) ((uint32_t)((((uint64_t)(x))>>32) & 0xffffffff))
#define LSB32(x) ((uint32_t)((((uint64_t)(x)) ) & 0xffffffff))
-#define __BIG_ENDIAN 4321
-#define __LITTLE_ENDIAN 1234
+#define __XBIG_ENDIAN 4321
+#define __XLITTLE_ENDIAN 1234
#ifdef WORDS_BIGENDIAN
-#define __BYTE_ORDER 4321
+#define __XBYTE_ORDER 4321
#else
-#define __BYTE_ORDER 1234
+#define __XBYTE_ORDER 1234
#endif
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if __XBYTE_ORDER == __XBIG_ENDIAN
#define U8TO32_BIG(c) (((uint32_t*)(c))[0])
#define U32TO8_BIG(c, v) ((uint32_t*)(c))[0]=v
#else
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/luffa.c
============================================================================
$ cvs diff -u -r2.5 -r2.6 luffa.c
--- rpm/rpmio/luffa.c 6 Dec 2009 16:40:02 -0000 2.5
+++ rpm/rpmio/luffa.c 18 Oct 2010 07:56:13 -0000 2.6
@@ -37,15 +37,15 @@
#define LIMIT_512 128
/*********************************/
-#define __BIG_ENDIAN 4321
-#define __LITTLE_ENDIAN 1234
+#define __XBIG_ENDIAN 4321
+#define __XLITTLE_ENDIAN 1234
#ifdef WORDS_BIGENDIAN
-#define __BYTE_ORDER 4321
+#define __XBYTE_ORDER 4321
#else
-#define __BYTE_ORDER 1234
+#define __XBYTE_ORDER 1234
#endif
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if __XBYTE_ORDER == __XBIG_ENDIAN
# define BYTES_SWAP32(x) x
# define BYTES_SWAP64(x) x
#else
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/shavite3.c
============================================================================
$ cvs diff -u -r2.2 -r2.3 shavite3.c
--- rpm/rpmio/shavite3.c 6 Dec 2009 16:40:02 -0000 2.2
+++ rpm/rpmio/shavite3.c 18 Oct 2010 07:56:13 -0000 2.3
@@ -15,12 +15,12 @@
enum {SUCCESS=0, FAIL=1, BAD_HASHBITLEN=2};
-#define __BIG_ENDIAN 4321
-#define __LITTLE_ENDIAN 1234
+#define __XBIG_ENDIAN 4321
+#define __XLITTLE_ENDIAN 1234
#ifdef WORDS_BIGENDIAN
-#define __BYTE_ORDER 4321
+#define __XBYTE_ORDER 4321
#else
-#define __BYTE_ORDER 1234
+#define __XBYTE_ORDER 1234
#endif
#define ONE8 0xFFU
@@ -30,7 +30,7 @@
#define T16(x) ((x) & ONE16)
#define T32(x) ((x) & ONE32)
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+#if __XBYTE_ORDER == __XLITTLE_ENDIAN
#define U8TO32_LITTLE(c) (((uint32_t*)(c))[0])
#define U16TO8_LITTLE(c, v) ((uint16_t*)(c))[0]=v
#define U32TO8_LITTLE(c, v) ((uint32_t*)(c))[0]=v
@@ -254,6 +254,7 @@
0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
};
+#ifdef UNUSED
/* One round of AES */
/* Input - 4 input words */
/* The input passes through ShiftRows, SubBytes, MixColumns */
@@ -271,6 +272,7 @@
output[3] = Table0[input[3] >> 24] ^ Table1[(input[0] >> 16) & 0xff] ^ \
Table2[(input[1] >> 8) & 0xff] ^ Table3[input[2] & 0xff]^key[3];
}
+#endif /* UNUSED */
/* One round of AES */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/simd.c
============================================================================
$ cvs diff -u -r2.4 -r2.5 simd.c
--- rpm/rpmio/simd.c 6 Dec 2009 16:40:02 -0000 2.4
+++ rpm/rpmio/simd.c 18 Oct 2010 07:56:13 -0000 2.5
@@ -41,17 +41,17 @@
#define IS_ALIGNED(p,n) 0
#endif
-#define __BIG_ENDIAN 4321
-#define __LITTLE_ENDIAN 1234
+#define __XBIG_ENDIAN 4321
+#define __XLITTLE_ENDIAN 1234
#ifdef WORDS_BIGENDIAN
-#define __BYTE_ORDER 4321
+#define __XBYTE_ORDER 4321
#else
-#define __BYTE_ORDER 1234
+#define __XBYTE_ORDER 1234
#endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
+# if __XBYTE_ORDER == __XLITTLE_ENDIAN
# define SIMD_LITTLE_ENDIAN
-# elif __BYTE_ORDER == __BIG_ENDIAN
+# elif __XBYTE_ORDER == __XBIG_ENDIAN
# define SIMD_BIG_ENDIAN
# endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
