Pavel Chromy

[openocd.git] / src / server / gdb_server.c

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index b4a79820c6ed2a6923243d8c3d957fe18404520d..fa203e7a6ece8b29a015fa2bebe7646558f21e48 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -303,7 +303,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                else if (reply == '-')\r
                {\r
                        /* Stop sending output packets for now */\r
-                       log_setCallback(NULL, NULL);\r
+                       log_remove_callback(gdb_log_callback, connection);\r
                        WARNING("negative reply, retrying");\r
                }\r
                else if (reply == 0x3)\r
@@ -316,7 +316,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                        else if (reply == '-')\r
                        {\r
                                /* Stop sending output packets for now */\r
-                               log_setCallback(NULL, NULL);\r
+                               log_remove_callback(gdb_log_callback, connection);\r
                                WARNING("negative reply, retrying");\r
                        }\r
                        else\r
@@ -579,7 +579,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
                        if (gdb_connection->frontend_state == TARGET_RUNNING)\r
                        {\r
                                /* stop forwarding log packets! */\r
-                               log_setCallback(NULL, NULL);\r
+                               log_remove_callback(gdb_log_callback, connection);\r
                                \r
                                if (gdb_connection->ctrl_c)\r
                                {\r
@@ -678,7 +678,7 @@ int gdb_connection_closed(connection_t *connection)
        }\r
 \r
        target_unregister_event_callback(gdb_target_callback_event_handler, connection);\r
-       log_setCallback(NULL, NULL);\r
+       log_remove_callback(gdb_log_callback, connection);\r
 \r
        return ERROR_OK;\r
 }\r
@@ -1459,7 +1459,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                        cmd[(packet_size - 6)/2] = 0x0;\r
                        \r
                        /* We want to print all debug output to GDB connection */\r
-                       log_setCallback(gdb_log_callback, connection);\r
+                       log_add_callback(gdb_log_callback, connection);\r
                        target_call_timer_callbacks();\r
                        command_run_line(cmd_ctx, cmd);\r
                        free(cmd);\r
@@ -1808,7 +1808,7 @@ static void gdb_log_callback(void *priv, const char *file, int line,
                return;\r
        }\r
 \r
-       char *t = allocPrintf(format, args);\r
+       char *t = alloc_printf(format, args);\r
        if (t == NULL)\r
                return;\r
        \r
@@ -1886,7 +1886,7 @@ int gdb_input_inner(connection_t *connection)
                                         * forward log output until the target is halted */\r
                                                gdb_connection_t *gdb_con = connection->priv;\r
                                                gdb_con->frontend_state = TARGET_RUNNING;\r
-                                               log_setCallback(gdb_log_callback, connection);\r
+                                               log_add_callback(gdb_log_callback, connection);\r
                                                gdb_step_continue_packet(connection, target, packet, packet_size);\r
                                        }\r
                                        break;\r