formatting fixes from Pavel Chromy
git-svn-id: svn://svn.berlios.de/openocd/trunk@392 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
da767f48da
commit
fad239c1db
|
@ -48,7 +48,7 @@ static char *log_strings[5] =
|
|||
|
||||
static int count = 0;
|
||||
|
||||
/* The log_printfv() serves to somewhat different goals:
|
||||
/* The log_puts() serves to somewhat different goals:
|
||||
*
|
||||
* - logging
|
||||
* - feeding low-level info to the user in GDB or Telnet
|
||||
|
@ -80,7 +80,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
|
|||
{
|
||||
/* print with count and time information */
|
||||
int t=(int)(time(NULL)-start);
|
||||
fprintf(log_output, "%s %d %d %s:%d %s(): %s", log_strings[level+1], count, t, file, line, function, string);
|
||||
fprintf(log_output, "%s %d %d %s:%d %s(): %s", log_strings[level+1], count, t, file, line, function, string);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -249,9 +249,9 @@ int log_remove_callback(log_callback_fn fn, void *priv)
|
|||
|
||||
for (p = &log_callbacks; (cb = *p); p = &(*p)->next)
|
||||
{
|
||||
if (cb->fn == fn && cb->priv == priv)
|
||||
{
|
||||
*p = cb->next;
|
||||
if (cb->fn == fn && cb->priv == priv)
|
||||
{
|
||||
*p = cb->next;
|
||||
free(cb);
|
||||
return ERROR_OK;
|
||||
}
|
||||
|
@ -283,15 +283,15 @@ char *alloc_printf(const char *fmt, va_list ap)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
int ret;
|
||||
ret = vsnprintf(string, size, fmt, ap);
|
||||
/* NB! The result of the vsnprintf() might be an *EMPTY* string! */
|
||||
if ((ret >= 0) && ((ret + 1) < size))
|
||||
int ret;
|
||||
ret = vsnprintf(string, size, fmt, ap);
|
||||
/* NB! The result of the vsnprintf() might be an *EMPTY* string! */
|
||||
if ((ret >= 0) && ((ret + 1) < size))
|
||||
break;
|
||||
|
||||
/* there was just enough or not enough space, allocate more in the next round */
|
||||
/* there was just enough or not enough space, allocate more in the next round */
|
||||
}
|
||||
|
||||
/* the returned buffer is by principle guaranteed to be at least one character longer */
|
||||
return string;
|
||||
return string;
|
||||
}
|
||||
|
|
|
@ -86,7 +86,7 @@ int telnet_outputline(connection_t *connection, const char *line)
|
|||
if (line_end)
|
||||
len = line_end-line;
|
||||
else
|
||||
len = strlen(line);
|
||||
len = strlen(line);
|
||||
|
||||
telnet_write(connection, line, len);
|
||||
if (line_end)
|
||||
|
@ -96,7 +96,7 @@ int telnet_outputline(connection_t *connection, const char *line)
|
|||
}
|
||||
else
|
||||
{
|
||||
line += len;
|
||||
line += len;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -193,7 +193,7 @@ void telnet_clear_line(connection_t *connection, telnet_connection_t *t_con)
|
|||
{
|
||||
telnet_write(connection, t_con->line + t_con->line_cursor, t_con->line_size - t_con->line_cursor);
|
||||
}
|
||||
|
||||
|
||||
/* backspace, overwrite with space, backspace */
|
||||
while (t_con->line_size > 0)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue