Same as last commit, for linux-proc-maps.c

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 67ecfe7d66d9220fc8c1888ac5ea075a98d8813e..0439d4cf2d556aeb90bcc40175580289d095a9f2 100644 (file)
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -6,6 +6,8 @@
        (dwfl_linux_kernel_find_elf): Likewise.
        (dwfl_linux_kernel_module_section_address): Likewise.
        * find-debuginfo.c (try_open): Likewise.
+       * linux-proc-maps.c (find_sysinfo_ehdr): Likewise.
+       (dwfl_linux_proc_report): Likewise.
 
        * libdwfl.h (dwfl_begin): Require nonnull argument.
 

diff --git a/libdwfl/linux-proc-maps.c b/libdwfl/linux-proc-maps.c
index 4b4dfc922fc3db05ae3416118bb2d3563fdf1dab..6eaed39ad0597cbcb796b2aec7c04a1d3851f2b8 100644 (file)
--- a/libdwfl/linux-proc-maps.c
+++ b/libdwfl/linux-proc-maps.c
@@ -1,5 +1,5 @@
 /* Standard libdwfl callbacks for debugging a live Linux process.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2007 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -72,9 +72,8 @@
 static int
 find_sysinfo_ehdr (pid_t pid, GElf_Addr *sysinfo_ehdr)
 {
-  char *fname = NULL;
-  asprintf (&fname, PROCAUXVFMT, pid);
-  if (fname == NULL)
+  char *fname;
+  if (asprintf (&fname, PROCAUXVFMT, pid) < 0)
     return ENOMEM;
 
   int fd = open64 (fname, O_RDONLY);
@@ -243,9 +242,8 @@ dwfl_linux_proc_report (Dwfl *dwfl, pid_t pid)
   if (result != 0)
     return result;
 
-  char *fname = NULL;
-  asprintf (&fname, PROCMAPSFMT, pid);
-  if (fname == NULL)
+  char *fname;
+  if (asprintf (&fname, PROCMAPSFMT, pid) < 0)
     return ENOMEM;
 
   FILE *f = fopen (fname, "r");
@@ -312,9 +310,8 @@ dwfl_linux_proc_find_elf (Dwfl_Module *mod __attribute__ ((unused)),
     {
       /* Special case for in-memory ELF image.  */
 
-      char *fname = NULL;
-      asprintf (&fname, PROCMEMFMT, pid);
-      if (fname == NULL)
+      char *fname;
+      if (asprintf (&fname, PROCMEMFMT, pid) < 0)
        return -1;
 
       int fd = open64 (fname, O_RDONLY);