Cleanup: flt.lttng-utils.debug-info: indentation fixes

[babeltrace.git] / src / plugins / lttng-utils / debug-info / bin-info.c

diff --git a/src/plugins/lttng-utils/debug-info/bin-info.c b/src/plugins/lttng-utils/debug-info/bin-info.c
index 72eb818932abe0768ec5605bec71c68571356143..b5afb0ff8672a5ccf8276dfdde123a4aba924dad 100644 (file)
--- a/src/plugins/lttng-utils/debug-info/bin-info.c
+++ b/src/plugins/lttng-utils/debug-info/bin-info.c
@@ -1,29 +1,9 @@
 /*
- * bin-info.c
+ * SPDX-License-Identifier: MIT
  *
  * Babeltrace - Executable and Shared Object Debug Info Reader
  *
  * Copyright 2015 Antoine Busque <abusque@efficios.com>
- *
- * Author: Antoine Busque <abusque@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #define BT_COMP_LOG_SELF_COMP (bin->self_comp)
@@ -300,7 +280,7 @@ end:
  *
  * @returns                    1 on if the build id of stored in `bin` matches
  *                             the build id of the ondisk file.
- *                             0 on if they are different or an error occured.
+ *                             0 on if they are different or an error occurred.
  */
 static
 int is_build_id_matching(struct bin_info *bin)
@@ -377,6 +357,9 @@ int bin_info_set_build_id(struct bin_info *bin, uint8_t *build_id,
                goto error;
        }
 
+       /* Free any previously set build id. */
+       g_free(bin->build_id);
+
        /* Set the build id. */
        bin->build_id = g_new0(uint8_t, build_id_len);
        if (!bin->build_id) {
@@ -393,7 +376,7 @@ int bin_info_set_build_id(struct bin_info *bin, uint8_t *build_id,
        bin->file_build_id_matches = is_build_id_matching(bin);
        if (!bin->file_build_id_matches) {
                BT_COMP_LOGI_STR("Supplied Build ID does not match Build ID of the "
-                               "binary or library found on the file system.");
+                       "binary or library found on the file system.");
                goto error;
        }
 
@@ -939,7 +922,7 @@ int bin_info_lookup_elf_function_name(struct bin_info *bin, uint64_t addr,
 
        while (scn && !sym) {
                ret = bin_info_get_nearest_symbol_from_section(
-                               scn, addr, &sym, &shdr);
+                       scn, addr, &sym, &shdr);
                if (ret) {
                        goto error;
                }
@@ -949,13 +932,13 @@ int bin_info_lookup_elf_function_name(struct bin_info *bin, uint64_t addr,
 
        if (sym) {
                sym_name = elf_strptr(bin->elf_file, shdr->sh_link,
-                               sym->st_name);
+                       sym->st_name);
                if (!sym_name) {
                        goto error;
                }
 
                ret = bin_info_append_offset_str(sym_name, sym->st_value, addr,
-                                               func_name);
+                       func_name);
                if (ret) {
                        goto error;
                }
@@ -1037,7 +1020,7 @@ int bin_info_lookup_cu_function_name(struct bt_dwarf_cu *cu, uint64_t addr,
                }
 
                ret = bin_info_append_offset_str(die_name, low_addr, addr,
-                                               func_name);
+                       func_name);
                free(die_name);
                if (ret) {
                        goto error;
@@ -1132,7 +1115,7 @@ int bin_info_lookup_function_name(struct bin_info *bin,
                ret = bin_info_set_dwarf_info(bin);
                if (ret) {
                        BT_COMP_LOGI_STR("Failed to set bin dwarf info, falling "
-                                       "back to ELF lookup.");
+                               "back to ELF lookup.");
                        /* Failed to set DWARF info, fallback to ELF. */
                        bin->is_elf_only = true;
                }
@@ -1152,14 +1135,14 @@ int bin_info_lookup_function_name(struct bin_info *bin,
 
        if (bin->is_elf_only) {
                ret = bin_info_lookup_elf_function_name(bin, addr,
-                               &_func_name);
+                       &_func_name);
                if (ret) {
                        BT_COMP_LOGI("Failed to lookup function name (ELF): "
                                "ret=%d", ret);
                }
        } else {
                ret = bin_info_lookup_dwarf_function_name(bin, addr,
-                               &_func_name);
+                       &_func_name);
                if (ret) {
                        BT_COMP_LOGI("Failed to lookup function name (DWARF): "
                                "ret=%d", ret);