Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 497888cf authored by Phil Carmody's avatar Phil Carmody Committed by Jiri Kosina
Browse files

treewide: fix potentially dangerous trailing ';' in #defined values/expressions 



All these are instances of
  #define NAME value;
or
  #define NAME(params_opt) value;

These of course fail to build when used in contexts like
  if(foo $OP NAME)
  while(bar $OP NAME)
and may silently generate the wrong code in contexts such as
  foo = NAME + 1;    /* foo = value; + 1; */
  bar = NAME - 1;    /* bar = value; - 1; */
  baz = NAME & quux; /* baz = value; & quux; */

Reported on comp.lang.c,
Message-ID: <ab0d55fe-25e5-482b-811e-c475aa6065c3@c29g2000yqd.googlegroups.com>
Initial analysis of the dangers provided by Keith Thompson in that thread.

There are many more instances of more complicated macros having unnecessary
trailing semicolons, but this pile seems to be all of the cases of simple
values suffering from the problem. (Thus things that are likely to be found
in one of the contexts above, more complicated ones aren't.)

Signed-off-by: default avatarPhil Carmody <ext-phil.2.carmody@nokia.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 06b72d06

Documentation/DocBook/v4l/io.xml

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ for (i = 0; i &lt; reqbuf.count; i++) 
      <programlisting>

&v4l2-requestbuffers; reqbuf;

/* Our current format uses 3 planes per buffer */

#define FMT_NUM_PLANES = 3;

#define FMT_NUM_PLANES = 3



struct {

	void *start[FMT_NUM_PLANES];

arch/alpha/include/asm/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define fd_cacheflush(addr,size) /* nothing */

#define fd_request_irq()        request_irq(FLOPPY_IRQ, floppy_interrupt,\

					    IRQF_DISABLED, "floppy", NULL)

#define fd_free_irq()           free_irq(FLOPPY_IRQ, NULL);

#define fd_free_irq()           free_irq(FLOPPY_IRQ, NULL)



#ifdef CONFIG_PCI

arch/h8300/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#include <asm/regs267x.h>

#endif



#define STUBSIZE 0xc000;

#define STUBSIZE 0xc000



unsigned long rom_length;

unsigned long memory_start;

arch/ia64/include/asm/sn/tioce.h

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ typedef volatile struct tioce { 
#define CE_LSI_GB_CFG1_RXL0S_THS_SHFT	0

#define CE_LSI_GB_CFG1_RXL0S_THS_MASK	(0xffULL << 0)

#define CE_LSI_GB_CFG1_RXL0S_SMP_SHFT	8

#define CE_LSI_GB_CFG1_RXL0S_SMP_MASK	(0xfULL << 8);

#define CE_LSI_GB_CFG1_RXL0S_SMP_MASK	(0xfULL << 8)

#define CE_LSI_GB_CFG1_RXL0S_ADJ_SHFT	12

#define CE_LSI_GB_CFG1_RXL0S_ADJ_MASK	(0x7ULL << 12)

#define CE_LSI_GB_CFG1_RXL0S_FLT_SHFT	15

arch/mips/include/asm/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static inline void fd_cacheflush(char * addr, long size) 
#define FLOPPY0_TYPE 		fd_drive_type(0)

#define FLOPPY1_TYPE		fd_drive_type(1)



#define FDC1			fd_getfdaddr1();

#define FDC1			fd_getfdaddr1()



#define N_FDC 1			/* do you *really* want a second controller? */

#define N_DRIVE 8