[rtems commit] Fix C files which had two semi-colons at EOL
Joel Sherrill
joel at rtems.org
Thu May 31 20:31:34 UTC 2012
Module: rtems
Branch: master
Commit: 721fe34aaea8c2ff86d76b27122c9ed72b5064f4
Changeset: http://git.rtems.org/rtems/commit/?id=721fe34aaea8c2ff86d76b27122c9ed72b5064f4
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Thu May 31 15:34:36 2012 -0500
Fix C files which had two semi-colons at EOL
---
.../libbsp/arm/nds/libfat/source/disc_io/io_fcsr.c | 2 +-
.../lib/libbsp/arm/nds/libnds/source/common/card.c | 4 ++--
c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c | 2 +-
c/src/lib/libbsp/m68k/av5282/network/network.c | 2 +-
c/src/lib/libbsp/m68k/mcf5235/network/network.c | 2 +-
c/src/lib/libbsp/m68k/mcf5329/network/network.c | 2 +-
c/src/lib/libbsp/m68k/uC5282/network/network.c | 2 +-
c/src/lib/libbsp/powerpc/beatnik/flash/flashcfg.c | 2 +-
.../libbsp/powerpc/shared/flash/spansionFlash.c | 2 +-
c/src/lib/libbsp/powerpc/shared/irq/irq_init.c | 2 +-
c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c | 2 +-
c/src/lib/libcpu/bfin/serial/uart.c | 2 +-
.../lib/libcpu/powerpc/ppc403/console/console405.c | 4 ++--
c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c | 4 ++--
cpukit/libblock/src/bdbuf.c | 2 +-
cpukit/libfs/src/dosfs/msdos_misc.c | 2 +-
cpukit/libi2c/libi2c.c | 2 +-
cpukit/libmisc/capture/capture.c | 2 +-
cpukit/score/src/coremsgflushsupp.c | 2 +-
cpukit/score/src/heapresizeblock.c | 2 +-
testsuites/libtests/cpuuse/tswitch.c | 2 +-
testsuites/libtests/flashdisk01/init.c | 2 +-
.../libtests/termios04/termios_testdriver_intr.c | 4 ++--
testsuites/psxtests/psxmsgq01/init.c | 3 +--
testsuites/samples/paranoia/paranoia.c | 4 ++--
25 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/c/src/lib/libbsp/arm/nds/libfat/source/disc_io/io_fcsr.c b/c/src/lib/libbsp/arm/nds/libfat/source/disc_io/io_fcsr.c
index bf4d276..07ab130 100644
--- a/c/src/lib/libbsp/arm/nds/libfat/source/disc_io/io_fcsr.c
+++ b/c/src/lib/libbsp/arm/nds/libfat/source/disc_io/io_fcsr.c
@@ -121,7 +121,7 @@ bool _FCSR_readSectors (u32 sector, u32 numSectors, void* buffer)
int i;
bool flagSramSector = false;
int readLength = numSectors * BYTES_PER_READ;
- u8* src;;
+ u8* src;
u8* dst;
// Find which region this read is in
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c b/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
index d47d5d0..7cde381 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
@@ -44,7 +44,7 @@ void cardWriteCommand(const uint8 * command) {
//---------------------------------------------------------------------------------
void cardPolledTransfer(uint32 flags, uint32 * destination, uint32 length, const uint8 * command) {
//---------------------------------------------------------------------------------
- u32 data;;
+ u32 data;
cardWriteCommand(command);
CARD_CR2 = flags;
uint32 * target = destination + length;
@@ -68,7 +68,7 @@ void cardStartTransfer(const uint8 * command, uint32 * destination, int channel,
// Set up a DMA channel to transfer a word every time the card makes one
DMA_SRC(channel) = (uint32)&CARD_DATA_RD;
DMA_DEST(channel) = (uint32)destination;
- DMA_CR(channel) = DMA_ENABLE | DMA_START_CARD | DMA_32_BIT | DMA_REPEAT | DMA_SRC_FIX | 0x0001;;
+ DMA_CR(channel) = DMA_ENABLE | DMA_START_CARD | DMA_32_BIT | DMA_REPEAT | DMA_SRC_FIX | 0x0001;
CARD_CR2 = flags;
}
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c b/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c
index fccff71..4e17fea 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c
+++ b/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c
@@ -140,7 +140,7 @@ void Init_PLL (void)
*((uint32_t*)SIC_IWR) = 0x1;
/* Configure PLL registers */
- *((uint16_t*)PLL_DIV) = ssel;;
+ *((uint16_t*)PLL_DIV) = ssel;
msel = msel<<9;
*((uint16_t*)PLL_CTL) = msel;
diff --git a/c/src/lib/libbsp/m68k/av5282/network/network.c b/c/src/lib/libbsp/m68k/av5282/network/network.c
index 02a0522..8045ef4 100644
--- a/c/src/lib/libbsp/m68k/av5282/network/network.c
+++ b/c/src/lib/libbsp/m68k/av5282/network/network.c
@@ -442,7 +442,7 @@ fec_rxDaemon (void *arg)
* FIXME: Packet filtering hook could be done here.
*/
struct ether_header *eh;
- int len = rxBd->length - sizeof(uint32_t);;
+ int len = rxBd->length - sizeof(uint32_t);
/*
* Invalidate the cache and push the packet up.
diff --git a/c/src/lib/libbsp/m68k/mcf5235/network/network.c b/c/src/lib/libbsp/m68k/mcf5235/network/network.c
index 110da20..ed98b4d 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/network/network.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/network/network.c
@@ -423,7 +423,7 @@ fec_rxDaemon (void *arg)
* FIXME: Packet filtering hook could be done here.
*/
struct ether_header *eh;
- int len = rxBd->length - sizeof(uint32_t);;
+ int len = rxBd->length - sizeof(uint32_t);
/*
* Invalidate the cache and push the packet up.
diff --git a/c/src/lib/libbsp/m68k/mcf5329/network/network.c b/c/src/lib/libbsp/m68k/mcf5329/network/network.c
index 79e7fa9..acc36ab 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/network/network.c
+++ b/c/src/lib/libbsp/m68k/mcf5329/network/network.c
@@ -415,7 +415,7 @@ static void fec_rxDaemon(void *arg)
* FIXME: Packet filtering hook could be done here.
*/
struct ether_header *eh;
- int len = rxBd->length - sizeof(uint32_t);;
+ int len = rxBd->length - sizeof(uint32_t);
m = sc->rxMbuf[rxBdIndex];
diff --git a/c/src/lib/libbsp/m68k/uC5282/network/network.c b/c/src/lib/libbsp/m68k/uC5282/network/network.c
index c890c90..475ab22 100644
--- a/c/src/lib/libbsp/m68k/uC5282/network/network.c
+++ b/c/src/lib/libbsp/m68k/uC5282/network/network.c
@@ -479,7 +479,7 @@ fec_rxDaemon (void *arg)
* FIXME: Packet filtering hook could be done here.
*/
struct ether_header *eh;
- int len = rxBd->length - sizeof(uint32_t);;
+ int len = rxBd->length - sizeof(uint32_t);
m = sc->rxMbuf[rxBdIndex];
#ifdef RTEMS_MCF5282_BSP_ENABLE_DATA_CACHE
diff --git a/c/src/lib/libbsp/powerpc/beatnik/flash/flashcfg.c b/c/src/lib/libbsp/powerpc/beatnik/flash/flashcfg.c
index 3dc76c5..b5ba08f 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/flash/flashcfg.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/flash/flashcfg.c
@@ -143,7 +143,7 @@ unsigned char hwp = 0, swp;
if ( enbl ) {
*p |= swp;
} else {
- *p &= ~swp;;
+ *p &= ~swp;
}
}
return 0;
diff --git a/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c b/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c
index 06f6f85..70af0a8 100644
--- a/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c
+++ b/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c
@@ -179,7 +179,7 @@ volatile union bconv *p;
uint32_t rval;
if ( 1 == b->width )
- off <<= 1;;
+ off <<= 1;
a = ADDR32(b, a, off);
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
index 2a91ef1..ca7feae 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
@@ -233,7 +233,7 @@ loop_exit:
tmp = ELCRS_INT9_LVL | ELCRS_INT10_LVL | ELCRS_INT11_LVL;
outb(tmp, ISA8259_S_ELCR);
tmp = ELCRM_INT5_LVL;
- outb(tmp, ISA8259_M_ELCR);;
+ outb(tmp, ISA8259_M_ELCR);
/*
* Set the Interrupt inputs to non-inverting level interrupt
*/
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
index 309ec00..a80f534 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
@@ -1458,7 +1458,7 @@ vmeUniverseDmaStartXX(volatile LERegister *base, int channel, uint32_t pci_addr,
{
/* help the compiler allocate registers */
- register volatile LERegister *b=base;;
+ register volatile LERegister *b=base;
register unsigned long dgcsoff=UNIV_REGOFF_DGCS,dgcs;
dgcs=READ_LE(b, dgcsoff);
diff --git a/c/src/lib/libcpu/bfin/serial/uart.c b/c/src/lib/libcpu/bfin/serial/uart.c
index 3747425..36ea349 100644
--- a/c/src/lib/libcpu/bfin/serial/uart.c
+++ b/c/src/lib/libcpu/bfin/serial/uart.c
@@ -531,7 +531,7 @@ void uart_exit(void)
*/
rtems_device_driver bfin_uart_open(rtems_device_major_number major,
rtems_device_minor_number minor, void *arg) {
- rtems_status_code sc = RTEMS_NOT_DEFINED;;
+ rtems_status_code sc = RTEMS_NOT_DEFINED;
rtems_libio_open_close_args_t *args = NULL;
/**
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console405.c b/c/src/lib/libcpu/powerpc/ppc403/console/console405.c
index f7972aa..033a9ef 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/console/console405.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/console/console405.c
@@ -248,7 +248,7 @@ spiPollRead (int minor)
{
/* Wait for character */
- while ((port->LSR & LSR_RSR)==0);;
+ while ((port->LSR & LSR_RSR)==0);
return port->RBR;
}
@@ -259,7 +259,7 @@ spiPollWrite(int minor, const char *buf, size_t len)
{
while (len-- > 0) {
- while (!(port->LSR & LSR_THE));;
+ while (!(port->LSR & LSR_THE));
port->THR = *buf++;
}
return 0;
diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c
index 7a52950..0733ddb 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c
@@ -212,7 +212,7 @@ tty0PollRead (int minor)
{
/* Wait for character */
- while ((tty0port->LSR & LSR_RSR)==0);;
+ while ((tty0port->LSR & LSR_RSR)==0);
return tty0port->RBR;
}
@@ -223,7 +223,7 @@ tty0PollWrite(int minor, const char *buf, size_t len)
{
while (len-- > 0) {
- while (!(tty0port->LSR & LSR_THE));;
+ while (!(tty0port->LSR & LSR_THE));
tty0port->THR = *buf++;
}
return 0;
diff --git a/cpukit/libblock/src/bdbuf.c b/cpukit/libblock/src/bdbuf.c
index 82c442f..4c53ff3 100644
--- a/cpukit/libblock/src/bdbuf.c
+++ b/cpukit/libblock/src/bdbuf.c
@@ -2701,7 +2701,7 @@ rtems_bdbuf_swapout_task (rtems_task_argument arg)
{
rtems_bdbuf_swapout_transfer transfer;
uint32_t period_in_ticks;
- const uint32_t period_in_msecs = bdbuf_config.swapout_period;;
+ const uint32_t period_in_msecs = bdbuf_config.swapout_period;
uint32_t timer_delta;
transfer.write_req = rtems_bdbuf_swapout_writereq_alloc ();
diff --git a/cpukit/libfs/src/dosfs/msdos_misc.c b/cpukit/libfs/src/dosfs/msdos_misc.c
index 9fdda6d..ed791ee 100644
--- a/cpukit/libfs/src/dosfs/msdos_misc.c
+++ b/cpukit/libfs/src/dosfs/msdos_misc.c
@@ -800,7 +800,7 @@ msdos_set_first_char4file_name(
{
uint32_t sec = (fat_cluster_num_to_sector_num(mt_entry, start.cln) +
(start.ofs >> fs_info->fat.vol.sec_log2));
- uint32_t byte = (start.ofs & (fs_info->fat.vol.bps - 1));;
+ uint32_t byte = (start.ofs & (fs_info->fat.vol.bps - 1));
ret = _fat_block_write(mt_entry, sec, byte + MSDOS_FILE_NAME_OFFSET, 1,
&fchar);
diff --git a/cpukit/libi2c/libi2c.c b/cpukit/libi2c/libi2c.c
index c3aee7d..88f8799 100644
--- a/cpukit/libi2c/libi2c.c
+++ b/cpukit/libi2c/libi2c.c
@@ -450,7 +450,7 @@ rtems_libi2c_register_bus (const char *name, rtems_libi2c_bus_t * bus)
/* initialization failed */
i = -err;
} else {
- busses[i].name = nmcpy;;
+ busses[i].name = nmcpy;
nmcpy = 0;
}
diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c
index 43e3c39..9f068f9 100644
--- a/cpukit/libmisc/capture/capture.c
+++ b/cpukit/libmisc/capture/capture.c
@@ -1047,7 +1047,7 @@ rtems_capture_open (uint32_t size, rtems_capture_timestamp timestamp __attribu
}
else
{
- capture_extension_index = rtems_object_id_get_index (capture_id);;
+ capture_extension_index = rtems_object_id_get_index (capture_id);
}
/*
diff --git a/cpukit/score/src/coremsgflushsupp.c b/cpukit/score/src/coremsgflushsupp.c
index 2f959f4..77f56d6 100644
--- a/cpukit/score/src/coremsgflushsupp.c
+++ b/cpukit/score/src/coremsgflushsupp.c
@@ -85,7 +85,7 @@ uint32_t _CORE_message_queue_Flush_support(
_ISR_Disable( level );
inactive_head = _Chain_Head( &the_message_queue->Inactive_messages );
- inactive_first = inactive_head->next;;
+ inactive_first = inactive_head->next;
message_queue_first = _Chain_First( &the_message_queue->Pending_messages );
message_queue_last = _Chain_Last( &the_message_queue->Pending_messages );
diff --git a/cpukit/score/src/heapresizeblock.c b/cpukit/score/src/heapresizeblock.c
index d085fc6..fb62319 100644
--- a/cpukit/score/src/heapresizeblock.c
+++ b/cpukit/score/src/heapresizeblock.c
@@ -44,7 +44,7 @@ static Heap_Resize_status _Heap_Resize_block_checked(
Heap_Block *next_block = _Heap_Block_at( block, block_size );
uintptr_t next_block_size = _Heap_Block_size( next_block );
- bool next_block_is_free = _Heap_Is_free( next_block );;
+ bool next_block_is_free = _Heap_Is_free( next_block );
_HAssert( _Heap_Is_block_in_heap( heap, next_block ) );
_HAssert( _Heap_Is_prev_used( next_block ) );
diff --git a/testsuites/libtests/cpuuse/tswitch.c b/testsuites/libtests/cpuuse/tswitch.c
index 5635014..6933f89 100644
--- a/testsuites/libtests/cpuuse/tswitch.c
+++ b/testsuites/libtests/cpuuse/tswitch.c
@@ -29,7 +29,7 @@
*/
struct taskSwitchLog taskSwitchLog[25];
int taskSwitchLogIndex;
-volatile int testsFinished;;
+volatile int testsFinished;
void Task_switch(
rtems_tcb *unused,
diff --git a/testsuites/libtests/flashdisk01/init.c b/testsuites/libtests/flashdisk01/init.c
index 5ca6614..3c6ffae 100644
--- a/testsuites/libtests/flashdisk01/init.c
+++ b/testsuites/libtests/flashdisk01/init.c
@@ -227,7 +227,7 @@ static int flashdisk_blank(
{
int eno = 0;
const uint8_t *current = get_data_pointer(sd, segment, offset);
- const uint8_t *end = current + size;;
+ const uint8_t *end = current + size;
while (eno == 0 && current != end) {
if (*current != 0xff) {
diff --git a/testsuites/libtests/termios04/termios_testdriver_intr.c b/testsuites/libtests/termios04/termios_testdriver_intr.c
index 086bbb3..72a5f9e 100644
--- a/testsuites/libtests/termios04/termios_testdriver_intr.c
+++ b/testsuites/libtests/termios04/termios_testdriver_intr.c
@@ -189,11 +189,11 @@ rtems_device_driver termios_test_driver_initialize(
status = rtems_timer_create(rtems_build_name('T', 'M', 'R', 'X'), &Rx_Timer);
if ( status )
- rtems_fatal_error_occurred(1);;
+ rtems_fatal_error_occurred(1);
status = rtems_timer_create(rtems_build_name('T', 'M', 'T', 'X'), &Tx_Timer);
if ( status )
- rtems_fatal_error_occurred(1);;
+ rtems_fatal_error_occurred(1);
return RTEMS_SUCCESSFUL;
}
diff --git a/testsuites/psxtests/psxmsgq01/init.c b/testsuites/psxtests/psxmsgq01/init.c
index 2591912..00e5f29 100644
--- a/testsuites/psxtests/psxmsgq01/init.c
+++ b/testsuites/psxtests/psxmsgq01/init.c
@@ -48,8 +48,7 @@ void verify_timed_receive(void);
void wait_for_signal(sigset_t *waitset, int sec, int expect_signal);
void verify_notify(void);
void verify_with_threads(void);
-void verify_timedout_mq_timedreceive(
- char *task_name, int que, int is_blocking);;
+void verify_timedout_mq_timedreceive(char *task_name, int que, int is_blocking);
void verify_timedout_mq_timedsend(int que, int is_blocking);
void verify_timed_receive(void);
void validate_mq_setattr(void);
diff --git a/testsuites/samples/paranoia/paranoia.c b/testsuites/samples/paranoia/paranoia.c
index 2620ca7..4000631 100644
--- a/testsuites/samples/paranoia/paranoia.c
+++ b/testsuites/samples/paranoia/paranoia.c
@@ -1471,7 +1471,7 @@ or 1/3 and 3/9 and 9/27 may disagree");
if ((CInvrse * Q) != ((CInvrse * Y) * S)) {
UfThold = Y;
BadCond (Failure, "Either accuracy deteriorates as numbers\n");
- printf ("approach a threshold = %.17e\n", UfThold);;
+ printf ("approach a threshold = %.17e\n", UfThold);
printf (" coming down from %.17e\n", C);
printf (" or else multiplication gets too many last digits wrong.\n");
}
@@ -1526,7 +1526,7 @@ or 1/3 and 3/9 and 9/27 may disagree");
printf ("yet X - Z yields %.17e .\n", Z9);
printf (" Should this NOT signal Underflow, ");
printf ("this is a SERIOUS DEFECT\nthat causes ");
- printf ("confusion when innocent statements like\n");;
+ printf ("confusion when innocent statements like\n");
printf (" if (X == Z) ... else");
printf (" ... (f(X) - f(Z)) / (X - Z) ...\n");
printf ("encounter Division by Zero although actually\n");
More information about the vc
mailing list