auracaster/sw_openocd
3
0
Fork 0
forked from auracaster/openocd
Code Pull Requests Activity

- Fixes '[<>]' whitespace

Browse Source 
- Replace ')\([<>]\)(' with ') \1 ('.
- Replace ')\([<>]\)\(\w\)' with ') \1 \2'.
- Replace '\(\w\)\([<>]\)(' with '\1 \2 ('.
- Replace '\(\w\)\([<>]\)\(\w\)' with '\1 \2 \3'.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2375 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch
2009-06-23 22:45:47 +00:00
parent fb1a9b2cb2
commit 6d1d58a1fc
39 changed files with 149 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/gdb_server.c
View File

@@ -109,7 +109,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data)
got_data=&t;
*got_data = 0;
if (gdb_con->buf_cnt>0)
if (gdb_con->buf_cnt > 0)
{
*got_data = 1;
return ERROR_OK;
@@ -125,7 +125,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data)
/* This can typically be because a "monitor" command took too long
* before printing any progress messages
*/
if (timeout_s>0)
if (timeout_s > 0)
{
return ERROR_GDB_TIMEOUT;
} else
@@ -649,7 +649,7 @@ int gdb_output_con(connection_t *connection, const char* line)
return ERROR_GDB_BUFFER_TOO_SMALL;
hex_buffer[0] = 'O';
for (i = 0; i<bin_size; i++)
for (i = 0; i < bin_size; i++)
snprintf(hex_buffer + 1 + i*2, 3, "%2.2x", line[i]);
hex_buffer[bin_size*2 + 1] = 0;
@@ -1268,7 +1268,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa
LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len);
for (i = 0; i<len; i++)
for (i = 0; i < len; i++)
{
uint32_t tmp;
sscanf(separator + 2*i, "%2" SCNx32 , &tmp);
@@ -1563,7 +1563,7 @@ static int compare_bank (const void * a, const void * b)
if (b1->base == b2->base)
{
return 0;
} else if (b1->base>b2->base)
} else if (b1->base > b2->base)
{
return 1;
} else
@@ -1654,7 +1654,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
xml_printf(&retval, &buffer, &pos, &size,
"PacketSize=%x;qXfer:memory-map:read%c;qXfer:features:read-;QStartNoAckMode+",
(GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1) && (flash_get_bank_count()>0)) ? '+' : '-');
(GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1) && (flash_get_bank_count() > 0)) ? '+' : '-');
if (retval != ERROR_OK)
{
@@ -1667,7 +1667,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
return ERROR_OK;
}
else if (strstr(packet, "qXfer:memory-map:read::") && (flash_get_bank_count()>0))
else if (strstr(packet, "qXfer:memory-map:read::") && (flash_get_bank_count() > 0))
{
/* We get away with only specifying flash here. Regions that are not
* specified are treated as if we provided no memory map(if not we
@@ -1702,7 +1702,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
flash_bank_t **banks = malloc(sizeof(flash_bank_t *)*flash_get_bank_count());
int i;
for (i = 0; i<flash_get_bank_count(); i++)
for (i = 0; i < flash_get_bank_count(); i++)
{
p = get_flash_bank_by_num(i);
if (p == NULL)
@@ -1718,11 +1718,11 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
qsort(banks, flash_get_bank_count(), sizeof(flash_bank_t *), compare_bank);
uint32_t ram_start = 0;
for (i = 0; i<flash_get_bank_count(); i++)
for (i = 0; i < flash_get_bank_count(); i++)
{
p = banks[i];
if (ram_start<p->base)
if (ram_start < p->base)
{
xml_printf(&retval, &xml, &pos, &size, "<memory type=\"ram\" start=\"0x%x\" length=\"0x%x\"/>\n",
ram_start, p->base-ram_start);
@@ -1800,7 +1800,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
}
xml_printf(&retval, &xml, &pos, &size, \
"l<target version=\"1.0\">\n<architecture>arm</architecture>\n</target>\n");
"l < target version=\"1.0\">\n < architecture > arm</architecture>\n</target>\n");
if (retval != ERROR_OK)
{

6
src/server/httpd.c
View File

@@ -34,7 +34,7 @@
#include <pthread.h>
#include <signal.h>
#define PAGE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
#define PAGE_NOT_FOUND "<html><head><title > File not found</title></head><body > File not found</body></html>"
int loadFile(const char *name, void **data, size_t *len);
@@ -71,7 +71,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp)
t = appendf(t, "Runtime error, file \"%s\", line %d:<br>",
interp->errorFileName, interp->errorLine);
t = appendf(t, " %s<br>", Jim_GetString(interp->result, NULL));
t = appendf(t, " %s < br>", Jim_GetString(interp->result, NULL));
Jim_ListLength(interp, interp->stackTrace, &len);
for (i = 0; i < len; i += 3)
{
@@ -84,7 +84,7 @@ static const char *httpd_exec_cgi_tcl_error(Jim_Interp *interp)
file = Jim_GetString(objPtr, NULL);
Jim_ListIndex(interp, interp->stackTrace, i + 2, &objPtr, JIM_NONE);
line = Jim_GetString(objPtr, NULL);
t = appendf(t, "In procedure '%s' called at file \"%s\", line %s<br>",
t = appendf(t, "In procedure '%s' called at file \"%s\", line %s < br>",
proc, file, line);
}
t = appendf(t, "</html></body>\n");

6
src/server/telnet_server.c
View File

@@ -120,8 +120,8 @@ void telnet_log_callback(void *priv, const char *file, int line,
/* clear the command line */
telnet_write(connection, "\r", 1);
for (i = strlen(t_con->prompt) + t_con->line_size; i>0; i -= 16)
telnet_write(connection, " ", i>16 ? 16 : i);
for (i = strlen(t_con->prompt) + t_con->line_size; i > 0; i -= 16)
telnet_write(connection, " ", i > 16 ? 16 : i);
telnet_write(connection, "\r", 1);
/* output the message */
@@ -130,7 +130,7 @@ void telnet_log_callback(void *priv, const char *file, int line,
/* put the command line to its previous state */
telnet_prompt(connection);
telnet_write(connection, t_con->line, t_con->line_size);
for (i = t_con->line_size; i>t_con->line_cursor; i--)
for (i = t_con->line_size; i > t_con->line_cursor; i--)
telnet_write(connection, "\b", 1);
}