Simplify print_lld_from_low_high_val ifdefery

[strace] / unwind.c

diff --git a/unwind.c b/unwind.c
index 5b0600833055ce1bf02ad754e3ea62aecae39b2a..326d184ee92b4df3324e61070032bd355ad83239 100644 (file)
--- a/unwind.c
+++ b/unwind.c
@@ -38,7 +38,7 @@
 # define fopen_for_input fopen
 #endif
 
-#define DPRINTF(F, A, ...) if (debug_flag) fprintf(stderr, " [unwind(" A ")] " F "\n", __VA_ARGS__)
+#define DPRINTF(F, A, ...) if (debug_flag) error_msg("[unwind(" A ")] " F, __VA_ARGS__)
 
 /*
  * Кeep a sorted array of cache entries,
@@ -103,13 +103,14 @@ unwind_init(void)
 void
 unwind_tcb_init(struct tcb *tcp)
 {
+       if (tcp->libunwind_ui)
+               return;
+
        tcp->libunwind_ui = _UPT_create(tcp->pid);
        if (!tcp->libunwind_ui)
                die_out_of_memory();
 
-       tcp->queue = malloc(sizeof(*tcp->queue));
-       if (!tcp->queue)
-               die_out_of_memory();
+       tcp->queue = xmalloc(sizeof(*tcp->queue));
        tcp->queue->head = NULL;
        tcp->queue->tail = NULL;
 }
@@ -152,9 +153,7 @@ build_mmap_cache(struct tcb* tcp)
                return;
        }
 
-       cache_head = calloc(cur_array_size, sizeof(*cache_head));
-       if (!cache_head)
-               die_out_of_memory();
+       cache_head = xcalloc(cur_array_size, sizeof(*cache_head));
 
        while (fgets(buffer, sizeof(buffer), fp) != NULL) {
                struct mmap_cache_t *entry;
@@ -197,19 +196,15 @@ build_mmap_cache(struct tcb* tcp)
 
                if (tcp->mmap_cache_size >= cur_array_size) {
                        cur_array_size *= 2;
-                       cache_head = realloc(cache_head,
-                                            cur_array_size * sizeof(*cache_head));
-                       if (!cache_head)
-                               die_out_of_memory();
+                       cache_head = xreallocarray(cache_head, cur_array_size,
+                                                  sizeof(*cache_head));
                }
 
                entry = &cache_head[tcp->mmap_cache_size];
                entry->start_addr = start_addr;
                entry->end_addr = end_addr;
                entry->mmap_offset = mmap_offset;
-               entry->binary_filename = strdup(binary_path);
-               if (!entry->binary_filename)
-                       die_out_of_memory();
+               entry->binary_filename = xstrdup(binary_path);
                tcp->mmap_cache_size++;
        }
        fclose(fp);
@@ -290,10 +285,8 @@ get_symbol_name(unw_cursor_t *cursor, char **name,
                        *offset = 0;
                        break;
                }
+               *name = xreallocarray(*name, 2, *size);
                *size *= 2;
-               *name = realloc(*name, *size);
-               if (!*name)
-                       die_out_of_memory();
        }
 }
 
@@ -372,9 +365,7 @@ stacktrace_walk(struct tcb *tcp,
        if (tcp->mmap_cache_size == 0)
                error_msg_and_die("bug: mmap_cache is empty");
 
-       symbol_name = malloc(symbol_name_size);
-       if (!symbol_name)
-               die_out_of_memory();
+       symbol_name = xmalloc(symbol_name_size);
 
        if (unw_init_remote(&cursor, libunwind_as, tcp->libunwind_ui) < 0)
                perror_msg_and_die("Can't initiate libunwind");
@@ -427,7 +418,7 @@ print_call_cb(void *dummy,
              unw_word_t function_offset,
              unsigned long true_offset)
 {
-       if (symbol_name)
+       if (symbol_name && (symbol_name[0] != '\0'))
                tprintf(STACK_ENTRY_SYMBOL_FMT);
        else if (binary_filename)
                tprintf(STACK_ENTRY_NOSYMBOL_FMT);
@@ -490,10 +481,7 @@ queue_put(struct queue_t *queue,
 {
        struct call_t *call;
 
-       call = malloc(sizeof(*call));
-       if (!call)
-               die_out_of_memory();
-
+       call = xmalloc(sizeof(*call));
        call->output_line = sprint_call_or_error(binary_filename,
                                                 symbol_name,
                                                 function_offset,