src/jtag/hla: free allocated memory in hl_interface_quit()

[openocd.git] / src / rtos / linux.c

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 8c150af2e7f093c1b133ececab0625785e3ab9b8..3b2a2b0c34b440fb72effcc1ab450213820dd434 100644 (file)
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -105,11 +105,11 @@ static int linux_os_dummy_update(struct rtos *rtos)
        return 0;
 }
 
-static int linux_compute_virt2phys(struct target *target, uint32_t address)
+static int linux_compute_virt2phys(struct target *target, target_addr_t address)
 {
        struct linux_os *linux_os = (struct linux_os *)
                target->rtos->rtos_specific_params;
-       uint32_t pa = 0;
+       target_addr_t pa = 0;
        int retval = target->type->virt2phys(target, address, &pa);
        if (retval != ERROR_OK) {
                LOG_ERROR("Cannot compute linux virt2phys translation");
@@ -309,10 +309,10 @@ static int linux_os_thread_reg_list(struct rtos *rtos,
        return ERROR_OK;
 }
 
-static int linux_os_detect(struct target *target)
+static bool linux_os_detect(struct target *target)
 {
        LOG_INFO("should no be called");
-       return 0;
+       return false;
 }
 
 static int linux_os_smp_init(struct target *target);
@@ -1213,7 +1213,7 @@ int linux_thread_extra_info(struct target *target,
                if (temp->threadid == threadid) {
                        char *pid = " PID: ";
                        char *pid_current = "*PID: ";
-                       char *name = "NAME: ";
+                       char *name = "Name: ";
                        int str_size = strlen(pid) + strlen(name);
                        char *tmp_str = calloc(1, str_size + 50);
                        char *tmp_str_ptr = tmp_str;
@@ -1225,13 +1225,12 @@ int linux_thread_extra_info(struct target *target,
                        else
                                tmp_str_ptr += sprintf(tmp_str_ptr, "%s", pid);
 
-                       tmp_str_ptr +=
-                               sprintf(tmp_str_ptr, "%d", (int)temp->pid);
-                       tmp_str_ptr += sprintf(tmp_str_ptr, "%s", " | ");
+                       tmp_str_ptr += sprintf(tmp_str_ptr, "%d, ", (int)temp->pid);
                        sprintf(tmp_str_ptr, "%s", name);
                        sprintf(tmp_str_ptr, "%s", temp->name);
                        char *hex_str = calloc(1, strlen(tmp_str) * 2 + 1);
-                       int pkt_len = hexify(hex_str, tmp_str, 0, strlen(tmp_str) * 2 + 1);
+                       size_t pkt_len = hexify(hex_str, (const uint8_t *)tmp_str,
+                               strlen(tmp_str), strlen(tmp_str) * 2 + 1);
                        gdb_put_packet(connection, hex_str, pkt_len);
                        free(hex_str);
                        free(tmp_str);