Removed extra line added before prompt. This is actually
fixing a regression that nobody has reacted to.
### Eclipse Workspace Patch 1.0
#P openocd
Index: src/helper/command.c
===================================================================
--- src/helper/command.c (revision 1600)
+++ src/helper/command.c (working copy)
@@ -479,19 +479,22 @@
int reslen;
result = Jim_GetString(Jim_GetResult(interp), &reslen);
- int i;
- char buff[256+1];
- for (i = 0; i < reslen; i += 256)
+ if (reslen>0)
{
- int chunk;
- chunk = reslen - i;
- if (chunk > 256)
- chunk = 256;
- strncpy(buff, result+i, chunk);
- buff[chunk] = 0;
- LOG_USER_N("%s", buff);
+ int i;
+ char buff[256+1];
+ for (i = 0; i < reslen; i += 256)
+ {
+ int chunk;
+ chunk = reslen - i;
+ if (chunk > 256)
+ chunk = 256;
+ strncpy(buff, result+i, chunk);
+ buff[chunk] = 0;
+ LOG_USER_N("%s", buff);
+ }
+ LOG_USER_N("%s", "\n");
}
- LOG_USER_N("%s", "\n");
retval=ERROR_OK;
}
return retval;
@@ -691,7 +694,7 @@
#if defined( _MSC_VER )
/* WinXX - is generic, the forward
* looking problem is this:
- *
+ *
* "win32" or "win64"
*
* "winxx" is generic.
Index: src/helper/log.c
===================================================================
--- src/helper/log.c (revision 1534)
+++ src/helper/log.c (working copy)
@@ -389,7 +389,7 @@
current_time=timeval_ms();
if (current_time-last_time>1000)
{
- LOG_WARNING("BUG: keep_alive() was not invoked in the 1000ms
timelimit. GDB alive packet not sent! (%lld)",
current_time-last_time);
+ LOG_WARNING("keep_alive() was not invoked in the 1000ms
timelimit.
GDB alive packet not sent! (%lld). Workaround: increase \"set
remotetimeout\" in GDB", current_time-last_time);
}
if (current_time-last_time>500)
{
--
Øyvind Harboe
Embedded software and hardware consulting services
http://consulting.zylin.com
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
