From d714e70cf6afe5edb6e7c946002e48f014d7beda Mon Sep 17 00:00:00 2001
From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Tue, 12 Sep 2023 17:59:37 -0400
Subject: [PATCH] A couple small cleanup things in libdwarf code, hopefully
 fixing tests

---
 src/symbols/symbols_with_libdwarf.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/symbols/symbols_with_libdwarf.cpp b/src/symbols/symbols_with_libdwarf.cpp
index b666c18..6031045 100644
--- a/src/symbols/symbols_with_libdwarf.cpp
+++ b/src/symbols/symbols_with_libdwarf.cpp
@@ -437,7 +437,8 @@ namespace cpptrace {
                                 return die_object(dbg, targdie);
                             }
                         default:
-                            assert(false);
+                            fprintf(stderr, "unknown form for attribute %d %d\n", dw_attrnum, form);
+                            exit(1);
                     }
                 }
             };
@@ -781,7 +782,6 @@ namespace cpptrace {
                     dbg,
                     die,
                     [pc, dwversion, &frame] (Dwarf_Debug dbg, const die_object& die) {
-                        int ret;
                         if(dump_dwarf) {
                             fprintf(
                                 stderr,
@@ -798,7 +798,12 @@ namespace cpptrace {
                             }
                         } else {
                             if(trace_dwarf) {
-                                fprintf(stderr, "pc in die %08llx %s\n", die.get_global_offset(), die.get_tag_name());
+                                fprintf(
+                                    stderr,
+                                    "pc in die %08llx %s\n",
+                                    (unsigned long long) die.get_global_offset(),
+                                    die.get_tag_name()
+                                );
                             }
                             if(dump_dwarf) {
                                 fprintf(stderr, "pc in die <-----------------------------------\n");
@@ -1013,9 +1018,9 @@ namespace cpptrace {
                 if(trace_dwarf) {
                     fprintf(
                         stderr,
-                        "%s %08lx %s\n",
+                        "%s %08llx %s\n",
                         obj_path.c_str(),
-                        frame_info.obj_address,
+                        (unsigned long long)frame_info.obj_address,
                         frame_info.symbol.c_str()
                     );
                 }