From b090f73b4dff18838152e8adbd35cc6129cbd2a1 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 21:38:07 +0000 Subject: Apply patch ltrace-0.7.91-tautology.patch patch_name: ltrace-0.7.91-tautology.patch present_in_specfile: true --- diff --git a/filter.c b/filter.c index ba50c40..d763079 100644 --- a/filter.c +++ b/filter.c @@ -79,7 +79,7 @@ filter_lib_matcher_name_init(struct filter_lib_matcher *matcher, { switch (type) { case FLM_MAIN: - assert(type != type); + //assert(type != type); abort(); case FLM_SONAME: @@ -137,7 +137,7 @@ matcher_matches_library(struct filter_lib_matcher *matcher, struct library *lib) case FLM_MAIN: return lib->type == LT_LIBTYPE_MAIN; } - assert(matcher->type != matcher->type); + //assert(matcher->type != matcher->type); abort(); } diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c index 953fd86..9583fca 100644 --- a/sysdeps/linux-gnu/proc.c +++ b/sysdeps/linux-gnu/proc.c @@ -242,9 +242,10 @@ process_tasks(pid_t pid, pid_t **ret_tasks, size_t *ret_n) size_t alloc = 0; while (1) { - struct dirent entry; struct dirent *result; - if (readdir_r(d, &entry, &result) != 0) { + errno = 0; + result = readdir(d); + if (result == NULL && errno != 0) { fail: free(tasks); closedir(d); diff --git a/sysdeps/linux-gnu/x86/fetch.c b/sysdeps/linux-gnu/x86/fetch.c index 6868101..c744112 100644 --- a/sysdeps/linux-gnu/x86/fetch.c +++ b/sysdeps/linux-gnu/x86/fetch.c @@ -523,7 +523,7 @@ classify(struct process *proc, struct fetch_context *context, default: /* Unsupported type. */ - assert(info->type != info->type); + //assert(info->type != info->type); abort(); } abort(); diff --git a/sysdeps/linux-gnu/x86/trace.c b/sysdeps/linux-gnu/x86/trace.c index 6a1a6a5..6d309fa 100644 --- a/sysdeps/linux-gnu/x86/trace.c +++ b/sysdeps/linux-gnu/x86/trace.c @@ -145,7 +145,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) return (size_t)-2; default: - assert(info->type != info->type); + //assert(info->type != info->type); abort(); } } @@ -158,7 +158,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info) switch (info->type) { default: - assert(info->type != info->type); + //assert(info->type != info->type); abort(); break; diff --git a/value.c b/value.c index 2125ba9..3d0460e 100644 --- a/value.c +++ b/value.c @@ -363,7 +363,7 @@ value_set_word(struct value *value, long word) u.u64 = word; break; default: - assert(sz != sz); + //assert(sz != sz); abort(); } @@ -414,7 +414,7 @@ value_extract_word(struct value *value, long *retp, *retp = (long)u.u64; return 0; default: - assert(sz != sz); + //assert(sz != sz); abort(); } }