command: use register_commands for handlers

[fw/openocd] / src / helper / membuf.c

diff --git a/src/helper/membuf.c b/src/helper/membuf.c
index 4e25d81a09aa5c2ebcb8ba42bf1c0353dfee9d79..766364a88e7066dbdba5281927012c1f1c9fbe49 100644 (file)
--- a/src/helper/membuf.c
+++ b/src/helper/membuf.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "membuf.h"
@@ -58,11 +58,13 @@ membuf_strtok(struct membuf *pBuf, const char *sep, void **pLast)
     if (pBuf) {
        pBuf->_strtoklast = NULL;
        *pLast = pBuf;
-       return strtok_r(((char *)(pBuf->buf)), sep, &(pBuf->_strtoklast));
+       // this should be "strtok_r()" but windows lacks */
+       return strtok(((char *)(pBuf->buf)), sep);
     } else {
        // recover our pBuf
        pBuf = *((struct membuf **)(pLast));
-       return strtok_r(NULL, sep, &(pBuf->_strtoklast));
+       // this should be "strtok_r()" but windows lacks */
+       return strtok( NULL, sep);
     }
 }