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 wrapper functions working with memory allocations ,
* they just terminate the program in case of memory allocation failure .
* These functions can be used by various binaries included in the strace
* package .
*
* Copyright ( c ) 2001 - 2017 The strace developers .
* All rights reserved .
*
* Redistribution and use in source and binary forms , with or without
* modification , are permitted provided that the following conditions
* are met :
* 1. Redistributions of source code must retain the above copyright
* notice , this list of conditions and the following disclaimer .
* 2. Redistributions in binary form must reproduce the above copyright
* notice , this list of conditions and the following disclaimer in the
* documentation and / or other materials provided with the distribution .
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission .
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ` ` AS IS ' ' AND ANY EXPRESS OR
* IMPLIED WARRANTIES , INCLUDING , BUT NOT LIMITED TO , THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED .
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT , INDIRECT ,
* INCIDENTAL , SPECIAL , EXEMPLARY , OR CONSEQUENTIAL DAMAGES ( INCLUDING , BUT
* NOT LIMITED TO , PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE ,
* DATA , OR PROFITS ; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY , WHETHER IN CONTRACT , STRICT LIABILITY , OR TORT
* ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE , EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE .
*/
# ifndef STRACE_XMALLOC_H
# define STRACE_XMALLOC_H
# include <stddef.h>
# include "gcc_compat.h"
void * xcalloc ( size_t nmemb , size_t size )
ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ( ( 1 , 2 ) ) ;
void * xmalloc ( size_t size ) ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ( ( 1 ) ) ;
void * xreallocarray ( void * ptr , size_t nmemb , size_t size )
ATTRIBUTE_ALLOC_SIZE ( ( 2 , 3 ) ) ;
2017-08-24 20:36:08 +03:00
2017-08-08 17:36:40 +03:00
/**
* Utility function for the simplification of managing various dynamic arrays .
* Knows better how to resize arrays . Dies if there ' s no enough memory .
*
* @ param [ in ] ptr Pointer to the array to be resized . If ptr is NULL ,
* new array is allocated .
* @ param [ in , out ] nmemb Pointer to the current member count . If ptr is
* NULL , it specifies number of members in the newly
* created array . If ptr is NULL and nmemb is 0 ,
* number of members in the new array is decided by
* the function . Member count is updated by the
* function to the new value .
* @ param [ in ] memb_size Size of array member in bytes .
* @ return Pointer to the ( re ) allocated array .
*/
void * xgrowarray ( void * ptr , size_t * nmemb , size_t memb_size ) ;
2017-08-24 20:36:08 +03:00
/*
* Note that the following two functions return NULL when NULL is specified
* and not when allocation is failed , since , as the " x " prefix implies ,
* the allocation failure leads to program termination , so we may re - purpose
* this return value and simplify the idiom " str ? xstrdup(str) : NULL " .
*/
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
char * xstrdup ( const char * str ) ATTRIBUTE_MALLOC ;
char * xstrndup ( const char * str , size_t n ) ATTRIBUTE_MALLOC ;
# endif /* !STRACE_XMALLOC_H */