__EVEN: expansion-safety

10eab32c · Rémi Denis-Courmont · ce145053 · 10eab32c · 10eab32c
Commit 10eab32c authored Jun 28, 2008 by Rémi Denis-Courmont
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

modules/demux/avi/libavi.c modules/demux/avi/libavi.c +1 -1

modules/demux/wav.c modules/demux/wav.c +1 -1

No files found.
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -33,7 +33,7 @@

 #define AVI_DEBUG 1

-#define __EVEN( x ) ( (x)&0x01 ? (x)+1 : (x) )
+#define __EVEN( x ) (((x) + 1) & ~1)

 static vlc_fourcc_t GetFOURCC( const uint8_t *p_buff )
 {

--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -73,7 +73,7 @@ struct demux_sys_t
    int pi_chan_table[AOUT_CHAN_MAX];
 };

-#define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) )
+#define __EVEN( x ) (((x) + 1) & ~1)

 static int ChunkFind( demux_t *, const char *, unsigned int * );