Menu
▾
▴
[Openocd-svn] r2376 - in trunk/src: . flash flash/ocl/at91sam7x helper jtag jtag/rlink jtag/zy1000 pld server svf target xsvf
|
From: <zw...@ma...> - 2009-06-24 00:47:38
|
Author: zwelch
Date: 2009-06-24 00:46:23 +0200 (Wed, 24 Jun 2009)
New Revision: 2376
Modified:
trunk/src/ecosboard.c
trunk/src/flash/at91sam7.c
trunk/src/flash/avrf.c
trunk/src/flash/cfi.c
trunk/src/flash/flash.c
trunk/src/flash/non_cfi.c
trunk/src/flash/ocl/at91sam7x/samflash.c
trunk/src/flash/pic32mx.c
trunk/src/flash/stm32x.c
trunk/src/flash/str9x.c
trunk/src/flash/str9xpec.c
trunk/src/helper/command.c
trunk/src/helper/fileio.c
trunk/src/helper/ioutil.c
trunk/src/helper/jim-eventloop.c
trunk/src/helper/jim.c
trunk/src/helper/jim.h
trunk/src/helper/log.h
trunk/src/helper/replacements.h
trunk/src/jtag/amt_jtagaccel.c
trunk/src/jtag/arm-jtag-ew.c
trunk/src/jtag/bitq.c
trunk/src/jtag/core.c
trunk/src/jtag/driver.c
trunk/src/jtag/dummy.c
trunk/src/jtag/ft2232.c
trunk/src/jtag/gw16012.c
trunk/src/jtag/interface.c
trunk/src/jtag/interface.h
trunk/src/jtag/parport.c
trunk/src/jtag/rlink/dtc_cmd.h
trunk/src/jtag/rlink/rlink.c
trunk/src/jtag/tcl.c
trunk/src/jtag/vsllink.c
trunk/src/jtag/zy1000/jtag_minidriver.h
trunk/src/openocd.c
trunk/src/pld/virtex2.c
trunk/src/server/gdb_server.c
trunk/src/server/httpd.c
trunk/src/server/server.c
trunk/src/svf/svf.c
trunk/src/target/arm11.c
trunk/src/target/arm720t.c
trunk/src/target/arm7_9_common.c
trunk/src/target/arm7tdmi.c
trunk/src/target/arm920t.c
trunk/src/target/arm926ejs.c
trunk/src/target/arm966e.c
trunk/src/target/arm9tdmi.c
trunk/src/target/arm_adi_v5.h
trunk/src/target/armv4_5.c
trunk/src/target/armv7m.c
trunk/src/target/armv7m.h
trunk/src/target/cortex_a8.c
trunk/src/target/cortex_m3.c
trunk/src/target/embeddedice.h
trunk/src/target/etb.c
trunk/src/target/image.c
trunk/src/target/mips32.c
trunk/src/target/mips32_pracc.c
trunk/src/target/mips32_pracc.h
trunk/src/target/mips_m4k.c
trunk/src/target/target.c
trunk/src/target/target.h
trunk/src/target/target_request.c
trunk/src/target/target_type.h
trunk/src/target/trace.c
trunk/src/target/xscale.c
trunk/src/xsvf/xsvf.c
Log:
Remove whitespace that occurs after '('.
- Replace '([ \t]*' with '('.
Modified: trunk/src/ecosboard.c
===================================================================
--- trunk/src/ecosboard.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/ecosboard.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -93,7 +93,7 @@
(int (*)(const char *, int))open,
close,
(int (*)(int, const void *, int))write,
- ( int (*)(int, void *, int))read
+ (int (*)(int, void *, int))read
};
#endif
@@ -253,7 +253,7 @@
void copydir(char *name, char *destdir);
#if 0
-MTAB_ENTRY( romfs_mte1,
+MTAB_ENTRY(romfs_mte1,
"/rom",
"romfs",
"",
@@ -1130,7 +1130,7 @@
// For simplicity we use _FILESYSTEM synchronization for all accesses since
// we should never block in any filesystem operations.
#if 1
-FSTAB_ENTRY( tftpfs_fste, "tftpfs", 0,
+FSTAB_ENTRY(tftpfs_fste, "tftpfs", 0,
CYG_SYNCMODE_NONE,
tftpfs_mount,
tftpfs_umount,
@@ -1151,7 +1151,7 @@
// mtab entry.
// This defines a single ROMFS loaded into ROM at the configured address
//
-// MTAB_ENTRY( rom_mte, // structure name
+// MTAB_ENTRY(rom_mte, // structure name
// "/rom", // mount point
// "romfs", // FIlesystem type
// "", // hardware device
@@ -1459,7 +1459,7 @@
// This defines the entry in the filesystem table.
// For simplicity we use _FILESYSTEM synchronization for all accesses since
// we should never block in any filesystem operations.
-FSTAB_ENTRY( logfs_fste, "logfs", 0,
+FSTAB_ENTRY(logfs_fste, "logfs", 0,
CYG_SYNCMODE_FILE_FILESYSTEM | CYG_SYNCMODE_IO_FILESYSTEM,
logfs_mount,
logfs_umount,
Modified: trunk/src/flash/at91sam7.c
===================================================================
--- trunk/src/flash/at91sam7.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/at91sam7.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -187,7 +187,7 @@
}
/* Prescaler adjust */
- if ( (((mckr & PMC_MCKR_PRES) >> 2) == 7) || (tmp == 0) )
+ if ((((mckr & PMC_MCKR_PRES) >> 2) == 7) || (tmp == 0) )
{
at91sam7_info->mck_valid = 0;
at91sam7_info->mck_freq = 0;
@@ -707,7 +707,7 @@
at91sam7_info->num_lockbits_on = 0;
for (lock_pos = 0; lock_pos < bank->num_sectors; lock_pos++)
{
- if ( ((status >> (16 + lock_pos))&(0x0001)) == 1)
+ if (((status >> (16 + lock_pos))&(0x0001)) == 1)
{
at91sam7_info->num_lockbits_on++;
bank->sectors[lock_pos].is_protected = 1;
@@ -725,7 +725,7 @@
at91sam7_info->num_nvmbits_on = 0;
for (gpnvm_pos = 0; gpnvm_pos < at91sam7_info->num_nvmbits; gpnvm_pos++)
{
- if ( ((status >> (8 + gpnvm_pos))&(0x01)) == 1)
+ if (((status >> (8 + gpnvm_pos))&(0x01)) == 1)
{
at91sam7_info->num_nvmbits_on++;
}
@@ -907,7 +907,7 @@
buffer[pos] = 0xFF;
}
- if ( at91sam7_write(bank, buffer, bank->sectors[first].offset, nbytes) != ERROR_OK)
+ if (at91sam7_write(bank, buffer, bank->sectors[first].offset, nbytes) != ERROR_OK)
{
return ERROR_FLASH_OPERATION_FAILED;
}
Modified: trunk/src/flash/avrf.c
===================================================================
--- trunk/src/flash/avrf.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/avrf.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -323,7 +323,7 @@
return ERROR_FAIL;
}
- LOG_INFO( "device id = 0x%08" PRIx32 "", device_id );
+ LOG_INFO("device id = 0x%08" PRIx32 "", device_id );
if (EXTRACT_MFG(device_id) != 0x1F)
{
LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F);
@@ -402,7 +402,7 @@
return ERROR_FAIL;
}
- LOG_INFO( "device id = 0x%08" PRIx32 "", device_id );
+ LOG_INFO("device id = 0x%08" PRIx32 "", device_id );
if (EXTRACT_MFG(device_id) != 0x1F)
{
LOG_ERROR("0x%" PRIx32 " is invalid Manufacturer for avr, 0x%X is expected", EXTRACT_MFG(device_id), 0x1F);
Modified: trunk/src/flash/cfi.c
===================================================================
--- trunk/src/flash/cfi.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/cfi.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -1154,7 +1154,7 @@
/* flash write code */
if (!cfi_info->write_algorithm)
{
- if ( target_code_size > sizeof(target_code) )
+ if (target_code_size > sizeof(target_code) )
{
LOG_WARNING("Internal error - target code buffer to small. Increase CFI_MAX_INTEL_CODESIZE and recompile.");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
Modified: trunk/src/flash/flash.c
===================================================================
--- trunk/src/flash/flash.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/flash.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -793,7 +793,7 @@
for (wrote = 0; wrote < (count*wordsize); wrote += cur_size)
{
- cur_size = MIN( (count*wordsize - wrote), sizeof(chunk) );
+ cur_size = MIN((count*wordsize - wrote), sizeof(chunk) );
flash_bank_t *bank;
bank = get_flash_bank_by_addr(target, address);
if (bank == NULL)
@@ -994,7 +994,7 @@
}
}
- if ( first == -1 || last == -1 )
+ if (first == -1 || last == -1 )
return ERROR_OK;
return flash_driver_erase(c, first, last);
@@ -1127,7 +1127,7 @@
if (erase)
{
/* calculate and erase sectors */
- retval = flash_erase_address_range( target, run_address, run_size );
+ retval = flash_erase_address_range(target, run_address, run_size );
}
if (retval == ERROR_OK)
Modified: trunk/src/flash/non_cfi.c
===================================================================
--- trunk/src/flash/non_cfi.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/non_cfi.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -114,10 +114,10 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 1, 16*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 32*KB),
- ERASE_REGION( 7, 64*KB)
+ ERASE_REGION(1, 16*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 32*KB),
+ ERASE_REGION(7, 64*KB)
}
},
{
@@ -131,10 +131,10 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 7, 64*KB),
- ERASE_REGION( 1, 32*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 16*KB)
+ ERASE_REGION(7, 64*KB),
+ ERASE_REGION(1, 32*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 16*KB)
}
},
@@ -236,10 +236,10 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 1, 16*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 32*KB),
- ERASE_REGION( 7, 64*KB)
+ ERASE_REGION(1, 16*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 32*KB),
+ ERASE_REGION(7, 64*KB)
}
},
{
@@ -253,10 +253,10 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 7, 64*KB),
- ERASE_REGION( 1, 32*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 16*KB)
+ ERASE_REGION(7, 64*KB),
+ ERASE_REGION(1, 32*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 16*KB)
}
},
{
@@ -270,9 +270,9 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 1, 16*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 32*KB),
+ ERASE_REGION(1, 16*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 32*KB),
ERASE_REGION(15, 64*KB)
}
},
@@ -287,9 +287,9 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 1, 16*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 32*KB),
+ ERASE_REGION(1, 16*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 32*KB),
ERASE_REGION(15, 64*KB)
}
},
@@ -304,9 +304,9 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 1, 16*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 32*KB),
+ ERASE_REGION(1, 16*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 32*KB),
ERASE_REGION(15, 64*KB)
}
},
@@ -322,9 +322,9 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 1, 16*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 32*KB),
+ ERASE_REGION(1, 16*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 32*KB),
ERASE_REGION(31, 64*KB)
}
},
@@ -340,9 +340,9 @@
.erase_region_info =
{
ERASE_REGION(31, 64*KB),
- ERASE_REGION( 1, 32*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 16*KB)
+ ERASE_REGION(1, 32*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 16*KB)
}
},
{
@@ -356,8 +356,8 @@
.num_erase_regions = 3,
.erase_region_info =
{
- ERASE_REGION( 8, 8*KB),
- ERASE_REGION( 2, 32*KB),
+ ERASE_REGION(8, 8*KB),
+ ERASE_REGION(2, 32*KB),
ERASE_REGION(30, 64*KB)
}
},
@@ -373,8 +373,8 @@
.erase_region_info =
{
ERASE_REGION(30, 64*KB),
- ERASE_REGION( 2, 32*KB),
- ERASE_REGION( 8, 8*KB)
+ ERASE_REGION(2, 32*KB),
+ ERASE_REGION(8, 8*KB)
}
},
{
@@ -388,9 +388,9 @@
.num_erase_regions = 4,
.erase_region_info =
{
- ERASE_REGION( 1, 16*KB),
- ERASE_REGION( 2, 8*KB),
- ERASE_REGION( 1, 32*KB),
+ ERASE_REGION(1, 16*KB),
+ ERASE_REGION(2, 8*KB),
+ ERASE_REGION(1, 32*KB),
ERASE_REGION(15, 64*KB)
}
},
Modified: trunk/src/flash/ocl/at91sam7x/samflash.c
===================================================================
--- trunk/src/flash/ocl/at91sam7x/samflash.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/ocl/at91sam7x/samflash.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -189,7 +189,7 @@
unsigned char *flash_ptr;
flash_ptr = (uint8 *)FLASH_AREA_ADDR + adr;
- for ( ;len; len--) {
+ for (;len; len--) {
if (*(flash_ptr++)!=*(src++)) return FLASH_STAT_VERIFE;
}
return FLASH_STAT_OK;
Modified: trunk/src/flash/pic32mx.c
===================================================================
--- trunk/src/flash/pic32mx.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/pic32mx.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -229,9 +229,9 @@
{
LOG_DEBUG("Erasing entire program flash");
status = pic32mx_nvm_exec(bank, NVMCON_OP_PFM_ERASE, 50);
- if ( status & NVMCON_NVMERR )
+ if (status & NVMCON_NVMERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & NVMCON_LVDERR )
+ if (status & NVMCON_LVDERR )
return ERROR_FLASH_OPERATION_FAILED;
return ERROR_OK;
}
@@ -245,9 +245,9 @@
status = pic32mx_nvm_exec(bank, NVMCON_OP_PAGE_ERASE, 10);
- if ( status & NVMCON_NVMERR )
+ if (status & NVMCON_NVMERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & NVMCON_LVDERR )
+ if (status & NVMCON_LVDERR )
return ERROR_FLASH_OPERATION_FAILED;
bank->sectors[i].is_erased = 1;
}
@@ -313,7 +313,7 @@
reg = (i / pic32mx_info->ppage_size) / 8;
bit = (i / pic32mx_info->ppage_size) - (reg * 8);
- if ( set )
+ if (set )
prot_reg[reg] &= ~(1 << bit);
else
prot_reg[reg] |= (1 << bit);
@@ -327,7 +327,7 @@
reg = (i / pic32mx_info->ppage_size) / 8;
bit = (i / pic32mx_info->ppage_size) - (reg * 8);
- if ( set )
+ if (set )
prot_reg[reg] &= ~(1 << bit);
else
prot_reg[reg] |= (1 << bit);
@@ -434,12 +434,12 @@
}
#endif
status = pic32mx_write_row(bank, address, source->address);
- if ( status & NVMCON_NVMERR ) {
+ if (status & NVMCON_NVMERR ) {
LOG_ERROR("Flash write error NVMERR (status = 0x%08" PRIx32 ")", status);
retval = ERROR_FLASH_OPERATION_FAILED;
break;
}
- if ( status & NVMCON_LVDERR ) {
+ if (status & NVMCON_LVDERR ) {
LOG_ERROR("Flash write error LVDERR (status = 0x%08" PRIx32 ")", status);
retval = ERROR_FLASH_OPERATION_FAILED;
break;
@@ -458,12 +458,12 @@
memcpy(&value, buffer, sizeof(uint32_t));
uint32_t status = pic32mx_write_word(bank, address, value);
- if ( status & NVMCON_NVMERR ) {
+ if (status & NVMCON_NVMERR ) {
LOG_ERROR("Flash write error NVMERR (status = 0x%08" PRIx32 ")", status);
retval = ERROR_FLASH_OPERATION_FAILED;
break;
}
- if ( status & NVMCON_LVDERR ) {
+ if (status & NVMCON_LVDERR ) {
LOG_ERROR("Flash write error LVDERR (status = 0x%08" PRIx32 ")", status);
retval = ERROR_FLASH_OPERATION_FAILED;
break;
@@ -564,9 +564,9 @@
memcpy(&value, buffer + bytes_written, sizeof(uint32_t));
status = pic32mx_write_word(bank, address, value);
- if ( status & NVMCON_NVMERR )
+ if (status & NVMCON_NVMERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & NVMCON_LVDERR )
+ if (status & NVMCON_LVDERR )
return ERROR_FLASH_OPERATION_FAILED;
bytes_written += 4;
@@ -580,9 +580,9 @@
memcpy(&value, buffer + bytes_written, bytes_remaining);
status = pic32mx_write_word(bank, address, value);
- if ( status & NVMCON_NVMERR )
+ if (status & NVMCON_NVMERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & NVMCON_LVDERR )
+ if (status & NVMCON_LVDERR )
return ERROR_FLASH_OPERATION_FAILED;
}
@@ -603,14 +603,14 @@
pic32mx_info->probed = 0;
device_id = ejtag_info->idcode;
- LOG_INFO( "device id = 0x%08" PRIx32 " (manuf 0x%03x dev 0x%02x, ver 0x%03x)",
+ LOG_INFO("device id = 0x%08" PRIx32 " (manuf 0x%03x dev 0x%02x, ver 0x%03x)",
device_id,
(unsigned)((device_id >> 1)&0x7ff),
(unsigned)((device_id >> 12)&0xff),
(unsigned)((device_id >> 20)&0xfff) );
if (((device_id >> 1)&0x7ff) != PIC32MX_MANUF_ID) {
- LOG_WARNING( "Cannot identify target as a PIC32MX family." );
+ LOG_WARNING("Cannot identify target as a PIC32MX family." );
return ERROR_FLASH_OPERATION_FAILED;
}
@@ -626,7 +626,7 @@
break;
}
if (pic32mx_devs[i].name == NULL) {
- LOG_WARNING( "Cannot identify target as a PIC32MX family." );
+ LOG_WARNING("Cannot identify target as a PIC32MX family." );
return ERROR_FLASH_OPERATION_FAILED;
}
}
@@ -646,7 +646,7 @@
}
#endif
- LOG_INFO( "flash size = %dkbytes", num_pages );
+ LOG_INFO("flash size = %dkbytes", num_pages );
/* calculate numbers of pages */
num_pages /= (page_size / 1024);
@@ -847,13 +847,13 @@
target_write_u32(target, PIC32MX_FLASH_CR, FLASH_LOCK);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
{
LOG_ERROR("pic32mx device protected");
return ERROR_OK;
}
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
{
LOG_ERROR("pic32mx device programming failed");
return ERROR_OK;
@@ -931,9 +931,9 @@
res = ERROR_OK;
status = pic32mx_write_word(bank, address, value);
- if ( status & NVMCON_NVMERR )
+ if (status & NVMCON_NVMERR )
res = ERROR_FLASH_OPERATION_FAILED;
- if ( status & NVMCON_LVDERR )
+ if (status & NVMCON_LVDERR )
res = ERROR_FLASH_OPERATION_FAILED;
if (res == ERROR_OK)
Modified: trunk/src/flash/stm32x.c
===================================================================
--- trunk/src/flash/stm32x.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/stm32x.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -182,9 +182,9 @@
status = stm32x_wait_status_busy(bank, 10);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
return ERROR_FLASH_OPERATION_FAILED;
/* clear readout protection and complementary option bytes
@@ -218,9 +218,9 @@
status = stm32x_wait_status_busy(bank, 10);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
return ERROR_FLASH_OPERATION_FAILED;
/* write protection byte 1 */
@@ -228,9 +228,9 @@
status = stm32x_wait_status_busy(bank, 10);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
return ERROR_FLASH_OPERATION_FAILED;
/* write protection byte 2 */
@@ -238,9 +238,9 @@
status = stm32x_wait_status_busy(bank, 10);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
return ERROR_FLASH_OPERATION_FAILED;
/* write protection byte 3 */
@@ -248,9 +248,9 @@
status = stm32x_wait_status_busy(bank, 10);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
return ERROR_FLASH_OPERATION_FAILED;
/* write protection byte 4 */
@@ -258,9 +258,9 @@
status = stm32x_wait_status_busy(bank, 10);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
return ERROR_FLASH_OPERATION_FAILED;
/* write readout protection bit */
@@ -268,9 +268,9 @@
status = stm32x_wait_status_busy(bank, 10);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
return ERROR_FLASH_OPERATION_FAILED;
target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK);
@@ -338,7 +338,7 @@
{
set = 1;
- if ( protection & (1 << i))
+ if (protection & (1 << i))
set = 0;
for (s = 0; s < stm32x_info->ppage_size; s++)
@@ -378,9 +378,9 @@
status = stm32x_wait_status_busy(bank, 10);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
return ERROR_FLASH_OPERATION_FAILED;
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
return ERROR_FLASH_OPERATION_FAILED;
bank->sectors[i].is_erased = 1;
}
@@ -445,7 +445,7 @@
reg = (i / stm32x_info->ppage_size) / 8;
bit = (i / stm32x_info->ppage_size) - (reg * 8);
- if ( set )
+ if (set )
prot_reg[reg] &= ~(1 << bit);
else
prot_reg[reg] |= (1 << bit);
@@ -459,7 +459,7 @@
reg = (i / stm32x_info->ppage_size) / 8;
bit = (i / stm32x_info->ppage_size) - (reg * 8);
- if ( set )
+ if (set )
prot_reg[reg] &= ~(1 << bit);
else
prot_reg[reg] |= (1 << bit);
@@ -658,12 +658,12 @@
status = stm32x_wait_status_busy(bank, 5);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
{
LOG_ERROR("flash memory not erased before writing");
return ERROR_FLASH_OPERATION_FAILED;
}
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
{
LOG_ERROR("flash memory write protected");
return ERROR_FLASH_OPERATION_FAILED;
@@ -684,12 +684,12 @@
status = stm32x_wait_status_busy(bank, 5);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
{
LOG_ERROR("flash memory not erased before writing");
return ERROR_FLASH_OPERATION_FAILED;
}
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
{
LOG_ERROR("flash memory write protected");
return ERROR_FLASH_OPERATION_FAILED;
@@ -720,7 +720,7 @@
/* read stm32 device id register */
target_read_u32(target, 0xE0042000, &device_id);
- LOG_INFO( "device id = 0x%08" PRIx32 "", device_id );
+ LOG_INFO("device id = 0x%08" PRIx32 "", device_id );
/* get flash size from target */
if (target_read_u16(target, 0x1FFFF7E0, &num_pages) != ERROR_OK)
@@ -740,7 +740,7 @@
if (num_pages == 0xffff)
{
/* number of sectors incorrect on revA */
- LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 128k flash" );
+ LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash" );
num_pages = 128;
}
}
@@ -755,7 +755,7 @@
if (num_pages == 0xffff)
{
/* number of sectors incorrect on revA */
- LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 32k flash" );
+ LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 32k flash" );
num_pages = 32;
}
}
@@ -770,7 +770,7 @@
if (num_pages == 0xffff)
{
/* number of sectors incorrect on revZ */
- LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 512k flash" );
+ LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 512k flash" );
num_pages = 512;
}
}
@@ -785,17 +785,17 @@
if (num_pages == 0xffff)
{
/* number of sectors incorrect on revZ */
- LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 256k flash" );
+ LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 256k flash" );
num_pages = 256;
}
}
else
{
- LOG_WARNING( "Cannot identify target as a STM32 family." );
+ LOG_WARNING("Cannot identify target as a STM32 family." );
return ERROR_FLASH_OPERATION_FAILED;
}
- LOG_INFO( "flash size = %dkbytes", num_pages );
+ LOG_INFO("flash size = %dkbytes", num_pages );
/* calculate numbers of pages */
num_pages /= (page_size / 1024);
@@ -1188,13 +1188,13 @@
target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK);
- if ( status & FLASH_WRPRTERR )
+ if (status & FLASH_WRPRTERR )
{
LOG_ERROR("stm32x device protected");
return ERROR_OK;
}
- if ( status & FLASH_PGERR )
+ if (status & FLASH_PGERR )
{
LOG_ERROR("stm32x device programming failed");
return ERROR_OK;
Modified: trunk/src/flash/str9x.c
===================================================================
--- trunk/src/flash/str9x.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/str9x.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -305,7 +305,7 @@
{
return retval;
}
- if ( status & 0x80 )
+ if (status & 0x80 )
break;
alive_sleep(1);
}
@@ -327,7 +327,7 @@
return retval;
}
- if ( status & 0x22 )
+ if (status & 0x22 )
{
LOG_ERROR("error erasing flash bank, status: 0x%x", status);
return ERROR_FLASH_OPERATION_FAILED;
@@ -365,7 +365,7 @@
adr = bank->base + bank->sectors[i].offset;
target_write_u16(target, adr, 0x60);
- if ( set )
+ if (set )
target_write_u16(target, adr, 0x01);
else
target_write_u16(target, adr, 0xD0);
@@ -578,7 +578,7 @@
for (timeout = 0; timeout < 1000; timeout++)
{
target_read_u8(target, bank_adr, &status);
- if ( status & 0x80 )
+ if (status & 0x80 )
break;
alive_sleep(1);
}
@@ -627,7 +627,7 @@
for (timeout = 0; timeout < 1000; timeout++)
{
target_read_u8(target, bank_adr, &status);
- if ( status & 0x80 )
+ if (status & 0x80 )
break;
alive_sleep(1);
}
Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/flash/str9xpec.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -101,7 +101,7 @@
int str9xpec_set_instr(jtag_tap_t *tap, uint32_t new_instr, tap_state_t end_state)
{
- if ( tap == NULL ){
+ if (tap == NULL ){
return ERROR_TARGET_INVALID;
}
@@ -325,7 +325,7 @@
arm7_9 = armv4_5->arch_info;
jtag_info = &arm7_9->jtag_info;
- str9xpec_info->tap = jtag_tap_by_position( jtag_info->tap->abs_chain_position - 1);
+ str9xpec_info->tap = jtag_tap_by_position(jtag_info->tap->abs_chain_position - 1);
str9xpec_info->isc_enable = 0;
str9xpec_build_block_list(bank);
@@ -349,7 +349,7 @@
tap = str9xpec_info->tap;
if (!str9xpec_info->isc_enable) {
- str9xpec_isc_enable( bank );
+ str9xpec_isc_enable(bank );
}
if (!str9xpec_info->isc_enable) {
@@ -438,7 +438,7 @@
tap = str9xpec_info->tap;
if (!str9xpec_info->isc_enable) {
- str9xpec_isc_enable( bank );
+ str9xpec_isc_enable(bank );
}
if (!str9xpec_info->isc_enable) {
@@ -518,7 +518,7 @@
tap = str9xpec_info->tap;
if (!str9xpec_info->isc_enable) {
- str9xpec_isc_enable( bank );
+ str9xpec_isc_enable(bank );
}
if (!str9xpec_info->isc_enable) {
@@ -575,7 +575,7 @@
/* last bank: 0xFF signals a full device protect */
if (last == 0xFF)
{
- if ( set )
+ if (set )
{
status = str9xpec_lock_device(bank);
}
@@ -589,7 +589,7 @@
{
for (i = first; i <= last; i++)
{
- if ( set )
+ if (set )
buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 1);
else
buf_set_u32(str9xpec_info->options, str9xpec_info->sector_bits[i], 1, 0);
@@ -919,13 +919,13 @@
tap = str9xpec_info->tap;
/* erase config options first */
- status = str9xpec_erase_area( bank, 0xFE, 0xFE );
+ status = str9xpec_erase_area(bank, 0xFE, 0xFE );
if ((status & ISC_STATUS_ERROR) != STR9XPEC_ISC_SUCCESS)
return status;
if (!str9xpec_info->isc_enable) {
- str9xpec_isc_enable( bank );
+ str9xpec_isc_enable(bank );
}
if (!str9xpec_info->isc_enable) {
Modified: trunk/src/helper/command.c
===================================================================
--- trunk/src/helper/command.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/helper/command.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -348,8 +348,8 @@
void command_output_text(command_context_t *context, const char *data)
{
- if ( context && context->output_handler && data ){
- context->output_handler( context, data );
+ if (context && context->output_handler && data ){
+ context->output_handler(context, data );
}
}
@@ -704,7 +704,7 @@
Jim_RegisterCoreCommands(interp);
#endif
-#if defined( _MSC_VER )
+#if defined(_MSC_VER )
/* WinXX - is generic, the forward
* looking problem is this:
*
@@ -713,18 +713,18 @@
* "winxx" is generic.
*/
HostOs = "winxx";
-#elif defined( __LINUX__)
+#elif defined(__LINUX__)
HostOs = "linux";
-#elif defined( __DARWIN__ )
+#elif defined(__DARWIN__ )
HostOs = "darwin";
-#elif defined( __CYGWIN__ )
+#elif defined(__CYGWIN__ )
HostOs = "cygwin";
-#elif defined( __MINGW32__ )
+#elif defined(__MINGW32__ )
HostOs = "mingw32";
#else
HostOs = "other";
#endif
- Jim_SetGlobalVariableStr( interp, "ocd_HOSTOS", Jim_NewStringObj( interp, HostOs , strlen(HostOs)) );
+ Jim_SetGlobalVariableStr(interp, "ocd_HOSTOS", Jim_NewStringObj(interp, HostOs , strlen(HostOs)) );
Jim_CreateCommand(interp, "ocd_find", jim_find, NULL, NULL);
Jim_CreateCommand(interp, "echo", jim_echo, NULL, NULL);
Modified: trunk/src/helper/fileio.c
===================================================================
--- trunk/src/helper/fileio.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/helper/fileio.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -182,7 +182,7 @@
static inline int fileio_local_fgets(fileio_t *fileio, uint32_t size, char *buffer)
{
- if ( fgets(buffer, size, fileio->file) == NULL)
+ if (fgets(buffer, size, fileio->file) == NULL)
return ERROR_FILEIO_OPERATION_FAILED;
return ERROR_OK;
Modified: trunk/src/helper/ioutil.c
===================================================================
--- trunk/src/helper/ioutil.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/helper/ioutil.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -325,34 +325,34 @@
fd1 = open(name1, O_WRONLY | O_CREAT, 0664);
if (fd1 < 0)
- SHOW_RESULT( open, fd1 );
+ SHOW_RESULT(open, fd1 );
fd2 = open(name2, O_RDONLY);
if (fd2 < 0)
- SHOW_RESULT( open, fd2 );
+ SHOW_RESULT(open, fd2 );
for (;;)
{
done = read(fd2, buf, IOSIZE );
if (done < 0)
{
- SHOW_RESULT( read, done );
+ SHOW_RESULT(read, done );
break;
}
- if ( done == 0 ) break;
+ if (done == 0 ) break;
wrote = write(fd1, buf, done);
- if ( wrote != done ) SHOW_RESULT( write, wrote );
+ if (wrote != done ) SHOW_RESULT(write, wrote );
- if ( wrote != done ) break;
+ if (wrote != done ) break;
}
err = close(fd1);
- if ( err < 0 ) SHOW_RESULT( close, err );
+ if (err < 0 ) SHOW_RESULT(close, err );
err = close(fd2);
- if ( err < 0 ) SHOW_RESULT( close, err );
+ if (err < 0 ) SHOW_RESULT(close, err );
}
@@ -372,7 +372,7 @@
}
dirp = opendir(name);
- if ( dirp == NULL ) SHOW_RESULT( opendir, -1 );
+ if (dirp == NULL ) SHOW_RESULT(opendir, -1 );
for (;;)
{
@@ -421,7 +421,7 @@
}
err = closedir(dirp);
- if ( err < 0 ) SHOW_RESULT( stat, err );
+ if (err < 0 ) SHOW_RESULT(stat, err );
}
Modified: trunk/src/helper/jim-eventloop.c
===================================================================
--- trunk/src/helper/jim-eventloop.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/helper/jim-eventloop.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -298,7 +298,7 @@
JimGetTime(&now_sec, &now_ms);
tvp = &tv;
dt = 1000 * (shortest->when_sec - now_sec);
- dt += ( shortest->when_ms - now_ms);
+ dt += (shortest->when_ms - now_ms);
if (dt < 0) {
dt = 1;
}
@@ -498,7 +498,7 @@
int tlen ;
jim_wide remain = 0;
const char *tok = Jim_GetString(argv[2], &tlen);
- if ( sscanf(tok,"after#%lld",&id) == 1) {
+ if (sscanf(tok,"after#%lld",&id) == 1) {
remain = Jim_DeleteTimeHandler(interp, id);
if (remain > -2) {
Jim_SetResult(interp, Jim_NewIntObj(interp, remain));
Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/helper/jim.c 2009-06-23 22:46:23 UTC (rev 2376)
@@ -117,25 +117,25 @@
* ---------------------------------------------------------------------------*/
static char *
-jim_vasprintf( const char *fmt, va_list ap )
+jim_vasprintf(const char *fmt, va_list ap )
{
#ifndef HAVE_VASPRINTF
/* yucky way */
static char buf[2048];
- vsnprintf( buf, sizeof(buf), fmt, ap );
+ vsnprintf(buf, sizeof(buf), fmt, ap );
/* garentee termination */
buf[sizeof(buf)-1] = 0;
#else
char *buf;
int result;
- result = vasprintf( &buf, fmt, ap );
+ result = vasprintf(&buf, fmt, ap );
if (result < 0) exit(-1);
#endif
return buf;
}
static void
-jim_vasprintf_done( void *buf )
+jim_vasprintf_done(void *buf )
{
#ifndef HAVE_VASPRINTF
(void)(buf);
@@ -438,7 +438,7 @@
char *endptr;
*intPtr = strtol(str, &endptr, 10);
- if ( (str[0] == '\0') || (str == endptr) )
+ if ((str[0] == '\0') || (str == endptr) )
return JIM_ERR;
if (endptr[0] != '\0') {
while (*endptr) {
@@ -544,10 +544,10 @@
#endif
/* This may actually crash... we do it last */
- if ( interp && interp->cookie_stderr ){
- Jim_fprintf( interp, interp->cookie_stderr, JIM_NL "JIM INTERPRETER PANIC: ");
- Jim_vfprintf( interp, interp->cookie_stderr, fmt, ap );
- Jim_fprintf( interp, interp->cookie_stderr, JIM_NL JIM_NL );
+ if (interp && interp->cookie_stderr ){
+ Jim_fprintf(interp, interp->cookie_stderr, JIM_NL "JIM INTERPRETER PANIC: ");
+ Jim_vfprintf(interp, interp->cookie_stderr, fmt, ap );
+ Jim_fprintf(interp, interp->cookie_stderr, JIM_NL JIM_NL );
}
abort();
}
@@ -2055,17 +2055,17 @@
StringAppendString(objPtr, str, len);
}
-void Jim_AppendString_sprintf( Jim_Interp *interp, Jim_Obj *objPtr, const char *fmt, ... )
+void Jim_AppendString_sprintf(Jim_Interp *interp, Jim_Obj *objPtr, const char *fmt, ... )
{
char *buf;
va_list ap;
- va_start( ap, fmt );
- buf = jim_vasprintf( fmt, ap );
+ va_start(ap, fmt );
+ buf = jim_vasprintf(fmt, ap );
va_end(ap);
- if ( buf ){
- Jim_AppendString( interp, objPtr, buf, -1 );
+ if (buf ){
+ Jim_AppendString(interp, objPtr, buf, -1 );
jim_vasprintf_done(buf);
}
}
@@ -2283,10 +2283,10 @@
haveprec = 0;
prec = -1; /* not found yet */
next_fmt:
- if ( fmtLen <= 0 ){
+ if (fmtLen <= 0 ){
break;
}
- switch ( *fmt ){
+ switch (*fmt ){
/* terminals */
case 'b': /* binary - not all printfs() do this */
case 's': /* string */
@@ -2341,11 +2341,11 @@
case '8':
case '9':
accum = 0;
- while ( isdigit(*fmt) && (fmtLen > 0) ){
+ while (isdigit(*fmt) && (fmtLen > 0) ){
accum = (accum * 10) + (*fmt - '0');
fmt++; fmtLen--;
}
- if ( inprec ){
+ if (inprec ){
haveprec = 1;
prec = accum;
} else {
@@ -2356,24 +2356,24 @@
/* suck up the next item as an integer */
fmt++; fmtLen--;
objc--;
- if ( objc <= 0 ){
+ if (objc <= 0 ){
goto not_enough_args;
}
- if ( Jim_GetWide(interp,objv[0],&wideValue )== JIM_ERR ){
+ if (Jim_GetWide(interp,objv[0],&wideValue )== JIM_ERR ){
Jim_FreeNewObj(interp, resObjPtr );
return NULL;
}
- if ( inprec ){
+ if (inprec ){
haveprec = 1;
prec = wideValue;
- if ( prec < 0 ){
+ if (prec < 0 ){
/* man 3 printf says */
/* if prec is negative, it is zero */
prec = 0;
}
} else {
width = wideValue;
- if ( width < 0 ){
+ if (width < 0 ){
ljust = 1;
width = -width;
}
@@ -2402,33 +2402,33 @@
*/
cp = fmt_str;
*cp++ = '%';
- if ( altfm ){
+ if (altfm ){
*cp++ = '#';
}
- if ( forceplus ){
+ if (forceplus ){
*cp++ = '+';
- } else if ( spad ){
+ } else if (spad ){
/* PLUS overrides */
*cp++ = ' ';
}
- if ( ljust ){
+ if (ljust ){
*cp++ = '-';
}
- if ( zpad ){
+ if (zpad ){
*cp++ = '0';
}
- if ( width > 0 ){
- sprintf( cp, "%d", width );
+ if (width > 0 ){
+ sprintf(cp, "%d", width );
/* skip ahead */
cp = strchr(cp,0);
}
/* did we find a period? */
- if ( inprec ){
+ if (inprec ){
/* then add it */
*cp++ = '.';
/* did something occur after the period? */
- if ( haveprec ){
- sprintf( cp, "%d", prec );
+ if (haveprec ){
+ sprintf(cp, "%d", prec );
}
cp = strchr(cp,0);
}
@@ -2441,7 +2441,7 @@
*cp++ = 's';
*cp = 0;
/* BUG: we do not handled embeded NULLs */
- snprintf( sprintf_buf, JIM_MAX_FMT, fmt_str, Jim_GetString( objv[0], NULL ));
+ snprintf(sprintf_buf, JIM_MAX_FMT, fmt_str, Jim_GetString(objv[0], NULL ));
break;
case 'c':
*cp++ = 'c';
@@ -2451,7 +2451,7 @@
return NULL;
}
c = (char) wideValue;
- snprintf( sprintf_buf, JIM_MAX_FMT, fmt_str, c );
+ snprintf(sprintf_buf, JIM_MAX_FMT, fmt_str, c );
break;
case 'f':
case 'F':
@@ -2461,11 +2461,11 @@
case 'E':
*cp++ = *fmt;
*cp = 0;
- if ( Jim_GetDouble( interp, objv[0], &doubleValue ) == JIM_ERR ){
- Jim_FreeNewObj( interp, resObjPtr );
+ if (Jim_GetDouble(interp, objv[0], &doubleValue ) == JIM_ERR ){
+ Jim_FreeNewObj(interp, resObjPtr );
return NULL;
}
- snprintf( sprintf_buf, JIM_MAX_FMT, fmt_str, doubleValue );
+ snprintf(sprintf_buf, JIM_MAX_FMT, fmt_str, doubleValue );
break;
case 'b':
case 'd':
@@ -2475,7 +2475,7 @@
case 'x':
case 'X':
/* jim widevaluse are 64bit */
- if ( sizeof(jim_wide) == sizeof(long long) ){
+ if (sizeof(jim_wide) == sizeof(long long) ){
*cp++ = 'l';
*cp++ = 'l';
} else {
@@ -2509,7 +2509,7 @@
#endif
sprintf_buf[ JIM_MAX_FMT - 1] = 0;
- Jim_AppendString( interp, resObjPtr, sprintf_buf, strlen(sprintf_buf) );
+ Jim_AppendString(interp, resObjPtr, sprintf_buf, strlen(sprintf_buf) );
/* next obj */
objv++;
fmt++;
@@ -2626,13 +2626,13 @@
Jim_Nvp *n;
int e;
- e = Jim_Nvp_name2value_obj( interp, nvp_table, objPtr, &n );
- if ( e == JIM_ERR ){
+ e = Jim_Nvp_name2value_obj(interp, nvp_table, objPtr, &n );
+ if (e == JIM_ERR ){
return e;
}
/* Success? found? */
- if ( n->name ){
+ if (n->name ){
/* remove const */
*result = (Jim_Nvp *)n;
return JIM_OK;
@@ -4424,11 +4424,11 @@
i->cookie_stdin = stdin;
i->cookie_stdout = stdout;
i->cookie_stderr = stderr;
- i->cb_fwrite = ((size_t (*)( const void *, size_t, size_t, void *))(fwrite));
- i->cb_fread = ((size_t (*)( void *, size_t, size_t, void *))(fread));
- i->cb_vfprintf = ((int (*)( void *, const char *fmt, va_list ))(vfprintf));
- i->cb_fflush = ((int (*)( void *))(fflush));
- i->cb_fgets = ((char * (*)( char *, int, void *))(fgets));
+ i->cb_fwrite = ((size_t (*)(const void *, size_t, size_t, void *))(fwrite));
+ i->cb_fread = ((size_t (*)(void *, size_t, size_t, void *))(fread));
+ i->cb_vfprintf = ((int (*)(void *, const char *fmt, va_list ))(vfprintf));
+ i->cb_fflush = ((int (*)(void *))(fflush));
+ i->cb_fgets = ((char * (*)(char *, int, void *))(fgets));
/* Note that we can create objects only after the
* interpreter liveList and freeList pointers are
@@ -4498,23 +4498,23 @@
if (i->liveList != NULL) {
Jim_Obj *objPtr = i->liveList;
- Jim_fprintf( i, i->cookie_stdout,JIM_NL "-------------------------------------" JIM_NL);
- Jim_fprintf( i, i->cookie_stdout,"Objects still in the free list:" JIM_NL);
+ Jim_fprintf(i, i->cookie_stdout,JIM_NL "-------------------------------------" JIM_NL);
+ Jim_fprintf(i, i->cookie_stdout,"Objects still in the free list:" JIM_NL);
while (objPtr) {
const char *type = objPtr->typePtr ?
objPtr->typePtr->name : "";
- Jim_fprintf( i, i->cookie_stdout,"%p \"%-10s\": '%.20s' (refCount: %d)" JIM_NL,
+ Jim_fprintf(i, i->cookie_stdout,"%p \"%-10s\": '%.20s' (refCount: %d)" JIM_NL,
objPtr, type,
objPtr->bytes ? objPtr->bytes
: "(null)", objPtr->refCount);
if (objPtr->typePtr == &sourceObjType) {
- Jim_fprintf( i, i->cookie_stdout, "FILE %s LINE %d" JIM_NL,
+ Jim_fprintf(i, i->cookie_stdout, "FILE %s LINE %d" JIM_NL,
objPtr->internalRep.sourceValue.fileName,
objPtr->internalRep.sourceValue.lineNumber);
}
objPtr = objPtr->nextObjPtr;
}
- Jim_fprintf( i, i->cookie_stdout, "-------------------------------------" JIM_NL JIM_NL);
+ Jim_fprintf(i, i->cookie_stdout, "-------------------------------------" JIM_NL JIM_NL);
Jim_Panic(i,"Live list non empty freeing the interpreter! Leak?");
}
/* Free all the freed objects. */
@@ -6352,7 +6352,7 @@
if (*pc->p == '-') {
pc->p++; pc->len--;
}
- while ( isdigit((int)*pc->p)
+ while (isdigit((int)*pc->p)
|| (allowhex && isxdigit((int)*pc->p) )
|| (allowdot && *pc->p == '.')
|| (pc->p-pc->tstart == 1 && *pc->tstart == '0' &&
@@ -8684,7 +8684,7 @@
Jim_Obj **eargv = NULL;
for (j = 0; j < argc; j++) {
- Jim_ExpandArgument( interp, &eargv, &eargc,
+ Jim_ExpandArgument(interp, &eargv, &eargc,
ecs[j] < 0, argv[j]);
}
if (argv != sargv)
@@ -8894,8 +8894,8 @@
Jim_IncrRefCount(scriptObjPtr);
- if ( filename ){
- JimSetSourceInfo( interp, scriptObjPtr, filename, lineno );
+ if (filename ){
+ JimSetSourceInfo(interp, scriptObjPtr, filename, lineno );
}
retval = Jim_EvalObj(interp, scriptObjPtr);
@@ -8905,7 +8905,7 @@
int Jim_Eval(Jim_Interp *interp, const char *script)
{
- return Jim_Eval_Named( interp, script, NULL, 0 );
+ return Jim_Eval_Named(interp, script, NULL, 0 );
}
@@ -8942,7 +8942,7 @@
Jim_IncrRefCount(objv[1]);
if (Jim_EvalObjVector(interp, 2, objv) != JIM_OK) {
/* Report the error to stderr. */
- Jim_fprintf( interp, interp->cookie_stderr, "Background error:" JIM_NL);
+ Jim_fprintf(interp, interp->cookie_stderr, "Background error:" JIM_NL);
Jim_PrintErrorMessage(interp);
}
Jim_DecrRefCount(interp, objv[0]);
@@ -8963,7 +8963,7 @@
const int cwd_len = 2048;
char *cwd = malloc(cwd_len);
Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
- if (!getcwd( cwd, cwd_len )) strcpy(cwd, "unknown");
+ if (!getcwd(cwd, cwd_len )) strcpy(cwd, "unknown");
Jim_AppendStrings(interp, Jim_GetResult(interp),
"Error loading script \"", filename, "\"",
" cwd: ", cwd,
@@ -9523,7 +9523,7 @@
}
str = Jim_GetString(argv[1], &len);
Jim_fwrite(interp, str, 1, len, interp->cookie_stdout);
- if (!nonewline) Jim_fprintf( interp, interp->cookie_stdout, JIM_NL);
+ if (!nonewline) Jim_fprintf(interp, interp->cookie_stdout, JIM_NL);
return JIM_OK;
}
@@ -12320,16 +12320,16 @@
JIM_NONE);
line = Jim_GetString(objPtr, NULL);
if (*proc) {
- Jim_fprintf( interp, interp->cookie_stderr,
+ Jim_fprintf(interp, interp->cookie_stderr,
"in procedure '%s' ", proc);
}
if (*file) {
- Jim_fprintf( interp, interp->cookie_stderr,
+ Jim_fprintf(interp, interp->cookie_stderr,
"called at file \"%s\", line %s",
file, line);
}
if (*file || *proc) {
- Jim_fprintf( interp, interp->cookie_stderr, JIM_NL);
+ Jim_fprintf(interp, interp->cookie_stderr, JIM_NL);
}
}
}
@@ -12357,8 +12357,8 @@
else
Jim_fprintf(interp,interp->cookie_stdout, "[%d] . ", retcode);
} else
- Jim_fprintf( interp, interp->cookie_stdout, ". ");
- Jim_fflush( interp, interp->cookie_stdout);
+ Jim_fprintf(interp, interp->cookie_stdout, ". ");
+ Jim_fflush(interp, interp->cookie_stdout);
scriptObjPtr = Jim_NewStringObj(interp, "", 0);
Jim_IncrRefCount(scriptObjPtr);
while (1) {
@@ -12366,7 +12366,7 @@
char state;
int len;
- if ( Jim_fgets(interp, buf, 1024, interp->cookie_stdin) == NULL) {
+ if (Jim_fgets(interp, buf, 1024, interp->cookie_stdin) == NULL) {
Jim_DecrRefCount(interp, scriptObjPtr);
goto out;
}
@@ -12374,8 +12374,8 @@
str = Jim_GetString(scriptObjPtr, &len);
if (Jim_ScriptIsComplete(str, len, &state))
break;
- Jim_fprintf( interp, interp->cookie_stdout, "%c> ", state);
- Jim_fflush( interp, interp->cookie_stdout);
+ Jim_fprintf(interp, interp->cookie_stdout, "%c> ", state);
+ Jim_fflush(interp, interp->cookie_stdout);
}
retcode = Jim_EvalObj(interp, scriptObjPtr);
Jim_DecrRefCount(interp, scriptObjPtr);
@@ -12386,8 +12386,8 @@
exit(Jim_GetExitCode(interp));
} else {
if (reslen) {
- Jim_fwrite( interp, result, 1, reslen, interp->cookie_stdout);
- Jim_fprintf( interp,interp->cookie_stdout, JIM_NL);
+ Jim_fwrite(interp, result, 1, reslen, interp->cookie_stdout);
+ Jim_fprintf(interp,interp->cookie_stdout, JIM_NL);
}
}
}
@@ -12399,66 +12399,66 @@
* Jim's idea of STDIO..
* ---------------------------------------------------------------------------*/
-int Jim_fprintf( Jim_Interp *interp, void *cookie, const char *fmt, ... )
+int Jim_fprintf(Jim_Interp *interp, void *cookie, const char *fmt, ... )
{
int r;
va_list ap;
va_start(ap,fmt);
- r = Jim_vfprintf( interp, cookie, fmt,ap );
+ r = Jim_vfprintf(interp, cookie, fmt,ap );
va_end(ap);
return r;
}
-int Jim_vfprintf( Jim_Interp *interp, void *cookie, const char *fmt, va_list ap )
+int Jim_vfprintf(Jim_Interp *interp, void *cookie, const char *fmt, va_list ap )
{
- if ( (interp == NULL) || (interp->cb_vfprintf == NULL) ){
+ if ((interp == NULL) || (interp->cb_vfprintf == NULL) ){
errno = ENOTSUP;
return -1;
}
- return (*(interp->cb_vfprintf))( cookie, fmt, ap );
+ return (*(interp->cb_vfprintf))(cookie, fmt, ap );
}
-size_t Jim_fwrite( Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *cookie )
+size_t Jim_fwrite(Jim_Interp *interp, const void *ptr, size_t size, size_t n, void *cookie )
{
- if ( (interp == NULL) || (interp->cb_fwrite == NULL) ){
+ if ((interp == NULL) || (interp->cb_fwrite == NULL) ){
errno = ENOTSUP;
return 0;
}
- return (*(interp->cb_fwrite))( ptr, size, n, cookie);
+ return (*(interp->cb_fwrite))(ptr, size, n, cookie);
}
-size_t Jim_fread( Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie )
+size_t Jim_fread(Jim_Interp *interp, void *ptr, size_t size, size_t n, void *cookie )
{
- if ( (interp == NULL) || (interp->cb_fread == NULL) ){
+ if ((interp == NULL) || (interp->cb_fread == NULL) ){
errno = ENOTSUP;
return 0;
}
- return (*(interp->cb_fread))( ptr, size, n, cookie);
+ return (*(interp->cb_fread))(ptr, size, n, cookie);
}
-int Jim_fflush( Jim_Interp *interp, void *cookie )
+int Jim_fflush(Jim_Interp *interp, void *cookie )
{
- if ( (interp == NULL) || (interp->cb_fflush == NULL) ){
+ if ((interp == NULL) || (interp->cb_fflush == NULL) ){
/* pretend all is well */
return 0;
}
- return (*(interp->cb_fflush))( cookie );
+ return (*(interp->cb_fflush))(cookie );
}
-char* Jim_fgets( Jim_Interp *interp, char *s, int size, void *cookie )
+char* Jim_fgets(Jim_Interp *interp, char *s, int size, void *cookie )
{
- if ( (interp == NULL) || (interp->cb_fgets == NULL) ){
+ if ((interp == NULL) || (interp->cb_fgets == NULL) ){
errno = ENOTSUP;
return NULL;
}
- return (*(interp->cb_fgets))( s, size, cookie );
+ return (*(interp->cb_fgets))(s, size, cookie );
}
Jim_Nvp *
-Jim_Nvp_name2value_simple( const Jim_Nvp *p, const char *name )
+Jim_Nvp_name2value_simple(const Jim_Nvp *p, const char *name )
{
- while ( p->name ){
- if ( 0 == strcmp( name, p->name ) ){
+ while (p->name ){
+ if (0 == strcmp(name, p->name ) ){
break;
}
p++;
@@ -12467,10 +12467,10 @@
}
Jim_Nvp *
-Jim_Nvp_name2value_nocase_simple( const Jim_Nvp *p, const char *name )
+Jim_Nvp_name2value_nocase_simple(const Jim_Nvp *p, const char *name )
{
- while ( p->name ){
- if ( 0 == strcasecmp( name, p->name ) ){
+ while (p->name ){
+ if (0 == strcasecmp(name, p->name ) ){
break;
}
p++;
@@ -12479,32 +12479,32 @@
}
int
-Jim_Nvp_name2value_obj( Jim_Interp *interp,
+Jim_Nvp_name2value_obj(Jim_Interp *interp,
const Jim_Nvp *p,
Jim_Obj *o,
Jim_Nvp **result )
{
- return Jim_Nvp_name2value( interp, p, Jim_GetString( o, NULL ), result );
+ return Jim_Nvp_name2value(interp, p, Jim_GetString(o, NULL ), result );
}
int
-Jim_Nvp_name2value( Jim_Interp *interp,
+Jim_Nvp_name2value(Jim_Interp *interp,
const Jim_Nvp *_p,
const char *name,
Jim_Nvp **result)
{
const Jim_Nvp *p;
- p = Jim_Nvp_name2value_simple( _p, name );
+ p = Jim_Nvp_name2value_simple(_p, name );
/* result */
- if ( result ){
+ if (result ){
*result = (Jim_Nvp *)(p);
}
/* found? */
- if ( p->name ){
+ if (p->name ){
return JIM_OK;
} else {
return JIM_ERR;
@@ -12512,23 +12512,23 @@
}
int
-Jim_Nvp_name2value_obj_nocase( Jim_Interp *interp, const Jim_Nvp *p, Jim_Obj *o, Jim_Nvp **puthere )
+Jim_Nvp_name2value_obj_nocase(Jim_Interp *interp, const Jim_Nvp *p, Jim_Obj *o, Jim_Nvp **puthere )
{
- return Jim_Nvp_name2value_nocase( interp, p, Jim_GetString( o, NULL ), puthere );
+ return Jim_Nvp_name2value_nocase(interp, p, Jim_GetString(o, NULL ), puthere );
}
int
-Jim_Nvp_name2value_nocase( Jim_Interp *interp, const Jim_Nvp *_p, const char *name, Jim_Nvp **puthere )
+Jim_Nvp_name2value_nocase(Jim_Interp *interp, const Jim_Nvp *_p, const char *name, Jim_Nvp **puthere )
{
const Jim_Nvp *p;
- p = Jim_Nvp_name2value_nocase_simple( _p, name );
+ p = Jim_Nvp_name2value_nocase_simple(_p, name );
- if ( puthere ){
+ if (puthere ){
*puthere = (Jim_Nvp *)(p);
}
/* found */
- if ( p->name ){
+ if (p->name ){
return JIM_OK;
} else {
return JIM_ERR;
@@ -12537,24 +12537,24 @@
int
-Jim_Nvp_value2name_obj( Jim_Interp *interp, const Jim_Nvp *p, Jim_Obj *o, Jim_Nvp **result )
+Jim_Nvp_value2name_obj(Jim_Interp *interp, const Jim_Nvp *p, Jim_Obj *o, Jim_Nvp **result )
{
int e;;
jim_wide w;
- e = Jim_GetWide( interp, o, &w );
- if ( e != JIM_OK ){
+ e = Jim_GetWide(interp, o, &w );
+ if (e != JIM_OK ){
return e;
}
- return Jim_Nvp_value2name( interp, p, w, result );
+ return Jim_Nvp_value2name(interp, p, w, result );
}
Jim_Nvp *
-Jim_Nvp_value2name_simple( const Jim_Nvp *p, int value )
+Jim_Nvp_value2name_simple(const Jim_Nvp *p, int value )
{
- while ( p->name ){
- if ( value == p->value ){
+ while (p->name ){
+ if (value == p->value ){
break;
}
p++;
@@ -12564,17 +12564,17 @@
int
-Jim_Nvp_value2name( Jim_Interp *interp, const Jim_Nvp *_p, int value, Jim_Nvp **result )
+Jim_Nvp_value2name(Jim_Interp *interp, const Jim_Nvp *_p, int value, Jim_Nvp **result )
{
const Jim_Nvp *p;
- p = Jim_Nvp_value2name_simple( _p, value );
+ p = Jim_Nvp_value2name_simple(_p, value );
- if ( result ){
+ if (result ){
*result = (Jim_Nvp *)(p);
}
- if ( p->name ){
+ if (p->name ){
return JIM_OK;
} else {
return JIM_ERR;
@@ -12583,9 +12583,9 @@
int
-Jim_GetOpt_Setup( Jim_GetOptInfo *p, Jim_Interp *interp, int argc, Jim_Obj * const * argv)
+Jim_GetOpt_Setup(Jim_GetOptInfo *p, Jim_Interp *interp, int argc, Jim_Obj * const * argv)
{
- memset( p, 0, sizeof(*p) );
+ memset(p, 0, sizeof(*p) );
p->interp = interp;
p->argc = argc;
p->argv = argv;
@@ -12594,37 +12594,37 @@
}
void
-Jim_GetOpt_Debug( Jim_GetOptInfo *p )
+Jim_GetOpt_Debug(Jim_GetOptInfo *p )
{
int x;
- Jim_fprintf( p->interp, p->interp->cookie_stderr, "---args---\n");
- for ( x = 0 ; x < p->argc ; x++ ){
- Jim_fprintf( p->interp, p->interp->cookie_stderr,
+ Jim_fprintf(p->interp, p->interp->cookie_stderr, "---args---\n");
+ for (x = 0 ; x < p->argc ; x++ ){
+ Jim_fprintf(p->interp, p->interp->cookie_stderr,
"%2d) %s\n",
x,
- Jim_GetString( p->argv[x], NULL ) );
+ Jim_GetString(p->argv[x], NULL ) );
}
- Jim_fprintf( p->interp, p->interp->cookie_stderr, "-------\n");
+ Jim_fprintf(p->interp, p->interp->cookie_stderr, "-------\n");
}
int
-Jim_GetOpt_Obj( Jim_GetOptInfo *goi, Jim_Obj **puthere )
+Jim_GetOpt_Obj(Jim_GetOptInfo *goi, Jim_Obj **puthere )
{
Jim_Obj *o;
o = NULL; // failure
- if ( goi->argc ){
+ if (goi->argc ){
// success
o = goi->argv[0];
goi->argc -= 1;
goi->argv += 1;
}
- if ( puthere ){
+ if (puthere ){
*puthere = o;
}
- if ( o != NULL ){
+ if (o != NULL ){
return JIM_OK;
} else {
return JIM_ERR;
@@ -12632,17 +12632,17 @@
}
int
-Jim_GetOpt_String( Jim_GetOptInfo *goi, char **puthere, int *len )
+Jim_GetOpt_String(Jim_GetOptInfo *goi, char **puthere, int *len )
{
int r;
Jim_Obj *o;
const char *cp;
- r = Jim_GetOpt_Obj( goi, &o );
- if ( r == JIM_OK ){
- cp = Jim_GetString( o, len );
- if ( puthere ){
+ r = Jim_GetOpt_Obj(goi, &o );
+ if (r == JIM_OK ){
+ cp = Jim_GetString(o, len );
+ if (puthere ){
/* remove const */
*puthere = (char *)(cp);
}
@@ -12651,47 +12651,47 @@
}
int
-Jim_GetOpt_Double( Jim_GetOptInfo *goi, double *puthere )
+Jim_GetOpt_Double(Jim_GetOptInfo *goi, double *puthere )
{
int r;
Jim_Obj *o;
double _safe;
- if ( puthere == NULL ){
+ if (puthere == NULL ){
puthere = &_safe;
}
- r = Jim_GetOpt_Obj( goi, &o );
- if ( r == JIM_OK ){
- r = Jim_GetDouble( goi->interp, o, puthere );
- if ( r != JIM_OK ){
- Jim_SetResult_sprintf( goi->interp,
+ r = Jim_GetOpt_Obj(goi, &o );
+ if (r == JIM_OK ){
+ r = Jim_GetDouble(goi->interp, o, puthere );
+ if (r != JIM_OK ){
+ Jim_SetResult_sprintf(goi->interp,
"not a number: %s",
- Jim_GetString( o, NULL ) );
+ Jim_GetString(o, NULL ) );
}
}
return r;
}
int
-Jim_GetOpt_Wide( Jim_GetOptInfo *goi, jim_wide *puthere )
+Jim_GetOpt_Wide(Jim_GetOptInfo *goi, jim_wide *puthere )
{
int r;
Jim_Obj *o;
jim_wide _safe;
- if ( puthere == NULL ){
+ if (puthere == NULL ){
puthere = &_safe;
}
- r = Jim_GetOpt_Obj( goi, &o );
- if ( r == JIM_OK ){
- r = Jim_GetWide( goi->interp, o, puthere );
+ r = Jim_GetOpt_Obj(goi, &o );
+ if (r == JIM_OK ){
+ r = Jim_GetWide(goi->interp, o, puthere );
}
return r;
}
-int Jim_GetOpt_Nvp( Jim_GetOptInfo *goi,
+int Jim_GetOpt_Nvp(Jim_GetOptInfo *goi,
const Jim_Nvp *nvp,
Jim_Nvp **puthere)
{
@@ -12699,13 +12699,13 @@
Jim_Obj *o;
int e;
- if ( puthere == NULL ){
+ if (puthere == NULL ){
puthere = &_safe;
}
- e = Jim_GetOpt_Obj( goi, &o );
- if ( e == JIM_OK ){
- e = Jim_Nvp_name2value_obj( goi->interp,
+ e = Jim_GetOpt_Obj(goi, &o );
+ if (e == JIM_OK ){
+ e = Jim_Nvp_name2value_obj(goi->interp,
nvp,
o,
puthere );
@@ -12715,17 +12715,17 @@
}
void
-Jim_GetOpt_NvpUnknown( Jim_GetOptInfo *goi,
+Jim_GetOpt_NvpUnknown(Jim_GetOptInfo *goi,
const Jim_Nvp *nvptable,
int hadprefix )
{
- if ( hadprefix ){
- Jim_SetResult_NvpUnknown( goi->interp,
+ if (hadprefix ){
+ Jim_SetResult_NvpUnknown(goi->interp,
goi->argv[-2],
goi->argv[-1],
nvptable );
} else {
- Jim_SetResult_NvpUnknown( goi->interp,
+ Jim_SetResult_NvpUnknown(goi->interp,
NULL,
goi->argv[-1],
nvptable );
@@ -12734,7 +12734,7 @@
int
-Jim_GetOpt_Enum( Jim_GetOptInfo *goi,
+Jim_GetOpt_Enum(Jim_GetOptInfo *goi,
const char * const * lookup,
int *puthere)
{
@@ -12742,12 +12742,12 @@
Jim_Obj *o;
int e;
- if ( puthere == NULL ){
+ if (puthere == NULL ){
puthere = &_safe;
}
- e = Jim_GetOpt_Obj( goi, &o );
- if ( e == JIM_OK ){
- e = Jim_GetEnum( goi->interp,
+ e = Jim_GetOpt_Obj(goi, &o );
+ if (e == JIM_OK ){
+ e = Jim_GetEnum(goi->interp,
o,
lookup,
puthere,
@@ -12760,16 +12760,16 @@
int
-Jim_SetResult_sprintf( Jim_Interp *interp, const char *fmt,... )
+Jim_SetResult_sprintf(Jim_Interp *interp, const char *fmt,... )
{
va_list ap;
char *buf;
va_start(ap,fmt);
- buf = jim_vasprintf( fmt, ap );
+ buf = jim_vasprintf(fmt, ap );
va_end(ap);
- if ( buf ){
- Jim_SetResultString( interp, buf, -1 );
+ if (buf ){
+ Jim_SetResultString(interp, buf, -1 );
jim_vasprintf_done(buf);
}
return JIM_OK;
@@ -12777,33 +12777,33 @@
void
-Jim_SetResult_NvpUnknown( Jim_Interp *interp,
+Jim_SetResult_NvpUnknown(Jim_Interp *interp,
Jim_Obj *param_name,
Jim_Obj *param_value,
const Jim_Nvp *nvp )
{
- if ( param_name ){
- Jim_SetResult_sprintf( interp,
+ if (param_name ){
+ Jim_SetResult_sprintf(interp,
"%s: Unknown: %s, try one of: ",
- Jim_GetString( param_name, NULL ),
- Jim_GetString( param_value, NULL ) );
+ Jim_GetString(param_name, NULL ),
+ Jim_GetString(param_value, NULL ) );
} else {
- Jim_SetResult_sprintf( interp,
+ Jim_SetResult_sprintf(interp,
"Unknown param: %s, try one of: ",
- Jim_GetString( param_value, NULL ) );
+ Jim_GetString(param_value, NULL ) );
}
- while ( nvp->name ){
+ while (nvp->name ){
const char *a;
const char *b;
- if ( (nvp + 1)->name ){
+ if ((nvp + 1)->name ){
a = nvp->name;
b = ", ";
} else {
a = "or ";
b = nvp->name;
}
- Jim_AppendStrings( interp,
+ Jim_AppendStrings(interp,
Jim_GetResult(interp),
a, b, NULL );
nvp++;
@@ -12814,22 +12814,22 @@
static Jim_Obj *debug_string_obj;
const char *
-Jim_Debug_ArgvString( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
+Jim_Debug_ArgvString(Jim_Interp *interp, int argc, Jim_Obj *const *argv )
{
int x;
- if ( debug_string_obj ){
- Jim_FreeObj( interp, debug_string_obj );
+ if (debug_string_obj ){
+ Jim_FreeObj(interp, debug_string_obj );
}
- debug_string_obj = Jim_NewEmptyStringObj( interp );
- for ( x = 0 ; x < argc ; x++ ){
- Jim_AppendStrings( interp,
+ debug_string_obj = Jim_NewEmptyStringObj(interp );
+ for (x = 0 ; x < argc ; x++ ){
+ Jim_AppendStrings(interp,
debug_string_obj,
- Jim_GetString( argv[x], NULL ),
+ Jim_GetString(argv[x], NULL ),
" ",
NULL );
}
- return Jim_GetString( debug_string_obj, NULL );
+ return Jim_GetString(debug_string_obj, NULL );
}
Modified: trunk/src/helper/jim.h
===================================================================
--- trunk/src/helper/jim.h 2009-06-23 22:45:47 UTC (rev 2375)
+++ trunk/src/helper/jim.h 2009-06-23 22:46:23 UTC (rev 2376)
@@ -530,11 +530,11 @@
void *cookie_stdin; /* input file pointer, 'stdin' by default */
void *cookie_stdout; /* output file pointer, 'stdout' by default */
void *cookie_stderr; /* errors file pointer, 'stderr' by default */
- size_t (*cb_fwrite )( const void *ptr, size_t size, size_t n, void *cookie );
- size_t (*cb_fread )( void *ptr, size_t size, size_t n, void *cookie );
- int (*cb_vfprintf)( void *cookie, const char *fmt, va_list ap );
- int (*cb_fflush )( void *cookie );
- char *(*cb_fgets )( char *s, int size, void *cookie );
+ size_t (*cb_fwrite )(const void *ptr, size_t size, size_t n, void *cookie );
+ size_t (*cb_fread )(void *ptr, size_t size, size_t n, void *cookie );
+ int (*cb_vfprintf)(void *cookie, const char *fmt, va_list ap );
+ int (*cb_fflush )(void *cookie );
+ char *(*cb_fgets )(char *s, int size, void *cookie );
} Jim_Interp;
/* Currently provided as macro that performs the increment.
@@ -591,11 +591,11 @@
* };
*
* Jim_Nvp *result
- * e = Jim_Nvp_name2value( interp, yn, "y", &result );
+ * e = Jim_Nvp_name2value(interp, yn, "y", &result );
* returns &yn[0];
- * e = Jim_Nvp_name2value( interp, yn, "n", &result );
+ * e = Jim_Nvp_name2value(interp, yn, "n", &result );
* returns &yn[1];
- * e = Jim_Nvp_name2value( interp, yn, "Blah", &result );
+ * e = Jim_Nvp_name2value(interp, yn, "Blah", &result );
* returns &yn[4];
* \endcode
*
@@ -629,7 +629,7 @@
#ifdef DOXYGEN
#define JIM_STATIC
-#define JIM_API( X ) X
+#define JIM_API(X ) X
#else
#ifndef __JIM_CORE__
# if defined JIM_EMBEDDED
@@ -650,7 +650,7 @@
#endif /* DOXYGEN */
/** Set the result - printf() style */
-JIM_STATIC int JIM_API( Jim_SetResult_sprintf )( Jim_Interp *p, const char *fmt, ... );
+JIM_STATIC int JIM_API(Jim_SetResult_sprintf )(Jim_Interp *p, const char *fmt, ... );
/* Memory allocation */
JIM_STATIC void * JIM_API(Jim_Alloc) (int size);
@@ -660,7 +660,7 @@
/* evaluation */
JIM_STATIC int JIM_API(Jim_Eval)(Jim_Interp *interp, const char *script);
/* in C code, you can do this and get better error messages */
-/* Jim_Eval_Named( interp, "some tcl commands", __FILE__, __LINE__ ); */
+/* Jim_Eval_Named(interp, "some tcl commands", __FILE__, __LINE__ ); */
JIM_STATIC int JIM_API(Jim_Eval_Named)(Jim_Interp *interp, const char *script,const char *filename, int lineno);
JIM_STATIC int JIM_API(Jim_EvalGlobal)(Jim_Interp *interp, const char *script);
JIM_STATIC int JIM_API(Jim_EvalFile)(Jim_Interp *interp, const char *filename);
@@ -911,28 +911,28 @@
JIM_STATIC void JIM_API(Jim_Panic) (Jim_Interp *interp, const char *fmt, ...);
/* Jim's STDIO */
-JIM_STATIC int JIM_API( Jim_fprintf )( Jim_Interp *int...
[truncated message content] |
