X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frtos%2Frtos.c;fp=src%2Frtos%2Frtos.c;h=4c99ad2333b17c53e4f0f772be0cb7fef2a4461e;hb=f4dfa3b0d0abac55b7c60d333018d53d09b21bef;hp=8f50b49e681df034a83281671d8aa8d7dac077f0;hpb=4c670b9d6498b944c70e5a314c3057202fd89ff6;p=openocd

diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index 8f50b49e..4c99ad23 100644
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -296,28 +296,20 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
 			struct thread_detail *detail = &target->rtos->thread_details[found];
 
 			int str_size = 0;
-			if (detail->display_str != NULL)
-				str_size += strlen(detail->display_str);
 			if (detail->thread_name_str != NULL)
 				str_size += strlen(detail->thread_name_str);
 			if (detail->extra_info_str != NULL)
 				str_size += strlen(detail->extra_info_str);
 
-			char *tmp_str = calloc(str_size + 7, sizeof(char));
+			char *tmp_str = calloc(str_size + 4, sizeof(char));
 			char *tmp_str_ptr = tmp_str;
 
-			if (detail->display_str != NULL)
-				tmp_str_ptr += sprintf(tmp_str_ptr, "%s", detail->display_str);
-			if (detail->thread_name_str != NULL) {
-				if (tmp_str_ptr != tmp_str)
-					tmp_str_ptr += sprintf(tmp_str_ptr, " : ");
+			if (detail->thread_name_str != NULL)
 				tmp_str_ptr += sprintf(tmp_str_ptr, "%s", detail->thread_name_str);
-			}
 			if (detail->extra_info_str != NULL) {
 				if (tmp_str_ptr != tmp_str)
 					tmp_str_ptr += sprintf(tmp_str_ptr, " : ");
-				tmp_str_ptr +=
-					sprintf(tmp_str_ptr, " : %s", detail->extra_info_str);
+				tmp_str_ptr += sprintf(tmp_str_ptr, "%s", detail->extra_info_str);
 			}
 
 			assert(strlen(tmp_str) ==
@@ -545,7 +537,6 @@ void rtos_free_threadlist(struct rtos *rtos)
 
 		for (j = 0; j < rtos->thread_count; j++) {
 			struct thread_detail *current_thread = &rtos->thread_details[j];
-			free(current_thread->display_str);
 			free(current_thread->thread_name_str);
 			free(current_thread->extra_info_str);
 		}