Merge pull request #183 from P403n1x87/chore/cherry-pick-177-to-master

chore: minor compilation fixes with gcc 11.3 [cherry-pick of #177 to master]
P403n1x87 · Jun 28, 2023 · b7eb5e2 · b7eb5e2
2 parents b48d980 + 8cbb77e
commit b7eb5e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/linux/addr2line.h b/src/linux/addr2line.h
@@ -206,15 +206,14 @@ get_native_frame(const char *file_name, bfd_vma addr, key_dt frame_key)
     bfd_map_over_sections(abfd, find_address_in_section, NULL);
 
     const char *name;
-    char *alloc = NULL;
 
     name = functionname;
     if (name == NULL || *name == '\0')
         name = "<unnamed>";
 #ifdef HAVE_LIBERTY
     else
     {
-        alloc = bfd_demangle(abfd, name, DMGL_PARAMS | DMGL_ANSI);
+        char *alloc = bfd_demangle(abfd, name, DMGL_PARAMS | DMGL_ANSI);
         if (alloc != NULL)
             name = alloc;
     }

diff --git a/src/py_proc_list.c b/src/py_proc_list.c
@@ -219,7 +219,7 @@ py_proc_list__update(py_proc_list_t * self) {
   for (;;) {
     // This code is inspired by the ps util
     ent = readdir(proc_dir);
-    if (!ent || !ent->d_name) break;
+    if (!ent) break;
     if ((*ent->d_name <= '0') || (*ent->d_name > '9')) continue;
 
     unsigned long pid = strtoul(ent->d_name, NULL, 10);