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-05 04:57:34 +03:00
/*
* This file contains error printing functions .
* These functions can be used by various binaries included in the strace
* package . Variable ' program_invocation_name ' and function ' die ( ) '
* have to be defined globally .
*
2018-12-25 02:46:43 +03:00
* Copyright ( c ) 2001 - 2018 The strace developers .
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-05 04:57:34 +03:00
* All rights reserved .
*
2018-12-10 03:00:00 +03:00
* SPDX - License - Identifier : LGPL - 2.1 - or - later
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-05 04:57:34 +03:00
*/
# ifndef STRACE_ERROR_PRINTS_H
2018-12-30 18:35:21 +03:00
# define STRACE_ERROR_PRINTS_H
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-05 04:57:34 +03:00
2018-12-30 18:35:21 +03:00
# include <stdbool.h>
2017-08-04 09:03:03 +03:00
2018-12-30 18:35:21 +03:00
# include "gcc_compat.h"
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-05 04:57:34 +03:00
2017-08-04 09:03:03 +03:00
extern bool debug_flag ;
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-05 04:57:34 +03:00
void die ( void ) ATTRIBUTE_NORETURN ;
void error_msg ( const char * fmt , . . . ) ATTRIBUTE_FORMAT ( ( printf , 1 , 2 ) ) ;
void perror_msg ( const char * fmt , . . . ) ATTRIBUTE_FORMAT ( ( printf , 1 , 2 ) ) ;
void perror_msg_and_die ( const char * fmt , . . . )
ATTRIBUTE_FORMAT ( ( printf , 1 , 2 ) ) ATTRIBUTE_NORETURN ;
void error_msg_and_help ( const char * fmt , . . . )
ATTRIBUTE_FORMAT ( ( printf , 1 , 2 ) ) ATTRIBUTE_NORETURN ;
void error_msg_and_die ( const char * fmt , . . . )
ATTRIBUTE_FORMAT ( ( printf , 1 , 2 ) ) ATTRIBUTE_NORETURN ;
2017-08-04 09:03:03 +03:00
/* Wrappers for if (debug_flag) error_msg(...) */
2018-12-30 18:35:21 +03:00
# define debug_msg(...) \
2017-08-04 09:03:03 +03:00
do { \
if ( debug_flag ) \
error_msg ( __VA_ARGS__ ) ; \
} while ( 0 )
2018-12-30 18:35:21 +03:00
# define debug_perror_msg(...) \
2017-08-04 09:03:03 +03:00
do { \
if ( debug_flag ) \
perror_msg ( __VA_ARGS__ ) ; \
} while ( 0 )
2017-08-04 09:03:34 +03:00
/* Simple wrappers for providing function name in error messages */
2018-12-30 18:35:21 +03:00
# define error_func_msg(fmt_, ...) \
2017-08-04 09:03:34 +03:00
error_msg ( " %s: " fmt_ , __func__ , # # __VA_ARGS__ )
2018-12-30 18:35:21 +03:00
# define perror_func_msg(fmt_, ...) \
2017-08-04 09:03:34 +03:00
perror_msg ( " %s: " fmt_ , __func__ , # # __VA_ARGS__ )
2018-12-30 18:35:21 +03:00
# define debug_func_msg(fmt_, ...) \
2017-08-04 09:03:34 +03:00
debug_msg ( " %s: " fmt_ , __func__ , # # __VA_ARGS__ )
2018-12-30 18:35:21 +03:00
# define debug_func_perror_msg(fmt_, ...) \
2017-08-04 09:03:34 +03:00
debug_perror_msg ( " %s: " fmt_ , __func__ , # # __VA_ARGS__ )
2018-12-30 18:35:21 +03:00
# define error_func_msg_and_die(fmt_, ...) \
2017-08-04 09:03:34 +03:00
error_msg_and_die ( " %s: " fmt_ , __func__ , # # __VA_ARGS__ )
2018-12-30 18:35:21 +03:00
# define perror_func_msg_and_die(fmt_, ...) \
2017-08-04 09:03:34 +03:00
perror_msg_and_die ( " %s: " fmt_ , __func__ , # # __VA_ARGS__ )
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-05 04:57:34 +03:00
# endif /* !STRACE_ERROR_PRINTS_H */