2 Commits

Author	SHA1	Message	Date
Baruch Siach	d45f27147f	error_prints: fix potential program_invocation_name type conflict ... uClibc-ng declares program_invocation_name as const. This causes the build failure below: error_prints.c:40:14: error: conflicting types for ‘program_invocation_name’ extern char *program_invocation_name; ^~~~~~~~~~~~~~~~~~~~~~~ In file included from error_prints.c:32:0: .../output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/errno.h:54:20: note: previous declaration of ‘program_invocation_name’ was here extern const char *program_invocation_name, *program_invocation_short_name; ^~~~~~~~~~~~~~~~~~~~~~~ * error_prints.c (program_invocation_name): Declare only in case of [!HAVE_PROGRAM_INVOCATION_NAME].	2017-09-08 10:42:52 +00:00
Edgar Kaziakhmedov	b4f16886e7	Move err/mem subroutines to separate files ... In order to allow usage of utility functions by other binaries included in the strace package (like the upcoming asinfo utility), these functions should be moved to separate files. * error_prints.h: New file. * xmalloc.h: Likewise. * defs.h: Include "xmalloc.h" and "error_prints.h". (error_msg, error_msg_and_die, error_msg_and_help, perror_msg, perror_msg_and_die): Move to error_prints.h. (xcalloc, xmalloc, xreallocarray, xstrdup, xstrndup): Move to xmalloc.h. * strace.c (die): Remove static quialifier to make visible by error_prints.c. (error_msg, error_msg_and_die, error_msg_and_help, perror_msg, perror_msg_and_die, verror_msg): Move ... * error_prints.c: ... to the new file. * xmalloc.c: Include "config.h", <stdlib.h>, <string.h>, "error_prints.h", and "xmalloc.h" instead of "defs.h". Use int instead of bool. Fix codestyle. * Makefile.am (strace_SOURCES): Add error_prints.c, error_prints.h, and xmalloc.h. Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov@virtuozzo.com> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>	2017-08-07 10:59:22 +00:00