From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============4084733848867470383==" MIME-Version: 1.0 From: Max Filippov To: elfutils-devel@lists.fedorahosted.org Subject: [PATCH 2/2] Replace assert_perror with assert Date: Mon, 04 May 2015 20:17:52 +0300 Message-ID: <1430759872-17715-3-git-send-email-jcmvbkbc@gmail.com> In-Reply-To: 1430759872-17715-1-git-send-email-jcmvbkbc@gmail.com --===============4084733848867470383== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable assert_perror is a GNU extension, it's not provided by uClibc and it's only used in tests. Replace it with assert. Signed-off-by: Max Filippov --- tests/ChangeLog | 8 ++++++++ tests/backtrace-child.c | 4 ++-- tests/backtrace-data.c | 22 +++++++++++----------- tests/backtrace-dwarf.c | 4 ++-- tests/backtrace.c | 10 +++++----- 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 11e96a7..a899947 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,11 @@ +2015-05-04 Max Filippov + + * backtrace-child.c (stdarg, main): Replace assert_perror with assert. + * backtrace-data.c (memory_read, maps_lookup, set_initial_registers) + (main): Likewise. + * backtrace-dwarf.c (main): Likewise. + * backtrace.c (prepare_thread, exec_dump): Likewise. + 2015-05-04 Anthony G. Basile = * Makefile.am (line2addr_LDADD, addrscopes_LDADD, funcscopes_LDADD) diff --git a/tests/backtrace-child.c b/tests/backtrace-child.c index 788801c..40e7b32 100644 --- a/tests/backtrace-child.c +++ b/tests/backtrace-child.c @@ -154,7 +154,7 @@ stdarg (int f UNUSED, ...) if (ptraceme) { long l =3D ptrace (PTRACE_TRACEME, 0, NULL, NULL); - assert_perror (errno); + assert (errno =3D=3D 0); assert (l =3D=3D 0); } #ifdef __x86_64__ @@ -226,7 +226,7 @@ main (int argc UNUSED, char **argv) { errno =3D 0; long l =3D ptrace (PTRACE_TRACEME, 0, NULL, NULL); - assert_perror (errno); + assert (errno =3D=3D 0); assert (l =3D=3D 0); } if (gencore) diff --git a/tests/backtrace-data.c b/tests/backtrace-data.c index 01c1c00..5a93a9c 100644 --- a/tests/backtrace-data.c +++ b/tests/backtrace-data.c @@ -74,7 +74,7 @@ memory_read (Dwfl *dwfl, Dwarf_Addr addr, Dwarf_Word *res= ult, = errno =3D 0; long l =3D ptrace (PTRACE_PEEKDATA, child, (void *) (uintptr_t) addr, NU= LL); - assert_perror (errno); + assert (errno =3D=3D 0); *result =3D l; = /* We could also return false for failed ptrace. */ @@ -89,10 +89,10 @@ maps_lookup (pid_t pid, Dwarf_Addr addr, GElf_Addr *bas= ep) { char *fname; int i =3D asprintf (&fname, "/proc/%ld/maps", (long) pid); - assert_perror (errno); + assert (errno =3D=3D 0); assert (i > 0); FILE *f =3D fopen (fname, "r"); - assert_perror (errno); + assert (errno =3D=3D 0); assert (f); free (fname); for (;;) @@ -100,7 +100,7 @@ maps_lookup (pid_t pid, Dwarf_Addr addr, GElf_Addr *bas= ep) // 37e3c22000-37e3c23000 rw-p 00022000 00:11 49532 /lib64/ld-2.14.90= .so */ unsigned long start, end, offset; i =3D fscanf (f, "%lx-%lx %*s %lx %*x:%*x %*x", &start, &end, &offse= t); - assert_perror (errno); + assert (errno =3D=3D 0); assert (i =3D=3D 3); char *filename =3D strdup (""); assert (filename); @@ -121,7 +121,7 @@ maps_lookup (pid_t pid, Dwarf_Addr addr, GElf_Addr *bas= ep) if (start <=3D addr && addr < end) { i =3D fclose (f); - assert_perror (errno); + assert (errno =3D=3D 0); assert (i =3D=3D 0); = *basep =3D start - offset; @@ -171,7 +171,7 @@ set_initial_registers (Dwfl_Thread *thread, = struct user_regs_struct user_regs; long l =3D ptrace (PTRACE_GETREGS, child, NULL, &user_regs); - assert_perror (errno); + assert (errno =3D=3D 0); assert (l =3D=3D 0); = Dwarf_Word dwarf_regs[17]; @@ -271,11 +271,11 @@ main (int argc __attribute__ ((unused)), char **argv = __attribute__ ((unused))) switch (child) { case -1: - assert_perror (errno); + assert (errno =3D=3D 0); assert (0); case 0:; long l =3D ptrace (PTRACE_TRACEME, 0, NULL, NULL); - assert_perror (errno); + assert (errno =3D=3D 0); assert (l =3D=3D 0); raise (SIGUSR1); return 0; @@ -285,7 +285,7 @@ main (int argc __attribute__ ((unused)), char **argv __= attribute__ ((unused))) = int status; pid_t pid =3D waitpid (child, &status, 0); - assert_perror (errno); + assert (errno =3D=3D 0); assert (pid =3D=3D child); assert (WIFSTOPPED (status)); assert (WSTOPSIG (status) =3D=3D SIGUSR1); @@ -303,7 +303,7 @@ main (int argc __attribute__ ((unused)), char **argv __= attribute__ ((unused))) = struct user_regs_struct user_regs; long l =3D ptrace (PTRACE_GETREGS, child, NULL, &user_regs); - assert_perror (errno); + assert (errno =3D=3D 0); assert (l =3D=3D 0); report_module (dwfl, child, user_regs.rip); = @@ -317,7 +317,7 @@ main (int argc __attribute__ ((unused)), char **argv __= attribute__ ((unused))) dwfl_end (dwfl); kill (child, SIGKILL); pid =3D waitpid (child, &status, 0); - assert_perror (errno); + assert (errno =3D=3D 0); assert (pid =3D=3D child); assert (WIFSIGNALED (status)); assert (WTERMSIG (status) =3D=3D SIGKILL); diff --git a/tests/backtrace-dwarf.c b/tests/backtrace-dwarf.c index fbcb22e..a644c8a 100644 --- a/tests/backtrace-dwarf.c +++ b/tests/backtrace-dwarf.c @@ -143,7 +143,7 @@ main (int argc __attribute__ ((unused)), char **argv) abort (); case 0:; long l =3D ptrace (PTRACE_TRACEME, 0, NULL, NULL); - assert_perror (errno); + assert (errno =3D=3D 0); assert (l =3D=3D 0); cleanup_13_main (); abort (); @@ -154,7 +154,7 @@ main (int argc __attribute__ ((unused)), char **argv) errno =3D 0; int status; pid_t got =3D waitpid (pid, &status, 0); - assert_perror (errno); + assert (errno =3D=3D 0); assert (got =3D=3D pid); assert (WIFSTOPPED (status)); assert (WSTOPSIG (status) =3D=3D SIGABRT); diff --git a/tests/backtrace.c b/tests/backtrace.c index 8b19b94..abd56ab 100644 --- a/tests/backtrace.c +++ b/tests/backtrace.c @@ -263,16 +263,16 @@ prepare_thread (pid_t pid2 __attribute__ ((unused)), struct user_regs_struct user_regs; errno =3D 0; l =3D ptrace (PTRACE_GETREGS, pid2, 0, (intptr_t) &user_regs); - assert_perror (errno); + assert (errno =3D=3D 0); assert (l =3D=3D 0); user_regs.rip =3D (intptr_t) jmp; l =3D ptrace (PTRACE_SETREGS, pid2, 0, (intptr_t) &user_regs); - assert_perror (errno); + assert (errno =3D=3D 0); assert (l =3D=3D 0); l =3D ptrace (PTRACE_CONT, pid2, NULL, (void *) (intptr_t) SIGUSR2); int status; pid_t got =3D waitpid (pid2, &status, __WALL); - assert_perror (errno); + assert (errno =3D=3D 0); assert (got =3D=3D pid2); assert (WIFSTOPPED (status)); assert (WSTOPSIG (status) =3D=3D SIGUSR1); @@ -340,7 +340,7 @@ exec_dump (const char *exec) errno =3D 0; int status; pid_t got =3D waitpid (pid, &status, 0); - assert_perror (errno); + assert (errno =3D=3D 0); assert (got =3D=3D pid); assert (WIFSTOPPED (status)); // Main thread will signal SIGUSR2. Other thread will signal SIGUSR1. @@ -350,7 +350,7 @@ exec_dump (const char *exec) __WCLONE, probably despite pthread_create already had to be called th= e new task is not yet alive enough for waitpid. */ pid_t pid2 =3D waitpid (-1, &status, __WALL); - assert_perror (errno); + assert (errno =3D=3D 0); assert (pid2 > 0); assert (pid2 !=3D pid); assert (WIFSTOPPED (status)); -- = 1.8.1.4 --===============4084733848867470383==--