Attachment #2582 for bug #2434

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2434
Collapse All | Expand All




# define OPT_SHADOW ""
#endif

#include "messages.h"
#include "xmalloc.h"
   pass those in every time. */
#define xcalloc(n, size)        x_calloc((n), (size), __FILE__, __LINE__)
#define xmalloc(size)           x_malloc((size), __FILE__, __LINE__)
#define xrealloc(p, size)       x_realloc((p), (size), __FILE__, __LINE__)
#define xstrdup(p)              x_strdup((p), __FILE__, __LINE__)
#define xstrndup(p, size)       x_strndup((p), (size), __FILE__, __LINE__)

#include <security/pam_appl.h>





# define OPT_SHADOW ""
#endif

#include "messages.h"
#include "xmalloc.h"
   pass those in every time. */
#define xcalloc(n, size)        x_calloc((n), (size), __FILE__, __LINE__)
#define xmalloc(size)           x_malloc((size), __FILE__, __LINE__)
#define xrealloc(p, size)       x_realloc((p), (size), __FILE__, __LINE__)
#define xstrdup(p)              x_strdup((p), __FILE__, __LINE__)
#define xstrndup(p, size)       x_strndup((p), (size), __FILE__, __LINE__)

#include <security/pam_appl.h>





#include <pwd.h>
#include <grp.h>

#include "xmalloc.h"
   number information for debugging error messages without the user having to
   pass those in every time. */
#define xcalloc(n, size)        x_calloc((n), (size), __FILE__, __LINE__)
#define xmalloc(size)           x_malloc((size), __FILE__, __LINE__)
#define xrealloc(p, size)       x_realloc((p), (size), __FILE__, __LINE__)
#define xstrdup(p)              x_strdup((p), __FILE__, __LINE__)
#define xstrndup(p, size)       x_strndup((p), (size), __FILE__, __LINE__)

/* These are the currently-supported types of traces. */
enum message_trace {




/* $Id: messages.h $
 *
 *  Message and error reporting (possibly fatal).
 *
 */

#if !defined(__MESSAGES_H__)
#define __MESSAGES_H__

/* The reporting functions.  The ones prefaced by "sys" add a colon, a space,
   and the results of strerror(errno) to the output and are intended for
   reporting failures of system calls. */
extern void die(const char *, ...)
    __attribute__((__noreturn__, __format__(printf, 1, 2)));
extern void sysdie(const char *, ...)
    __attribute__((__noreturn__, __format__(printf, 1, 2)));

#endif /* __MESSAGES_H__ */

Lines 70-75 Link Here

(-)b/src/xmalloc.c (+2 lines)
70	#include <pwd.h>	70	#include <pwd.h>
71	#include <grp.h>	71	#include <grp.h>
72		72
		73	#include "messages.h"
		74
73	/* Failure handler takes the function, the size, the file, and the line. */	75	/* Failure handler takes the function, the size, the file, and the line. */
74	typedef void (xmalloc_handler_t)(const char , size_t, const char *, int);	76	typedef void (xmalloc_handler_t)(const char , size_t, const char *, int);
75		77




/* $Id: xmalloc.h $
 *
 *  malloc routines with failure handling.
 *
 */

#if !defined(__XMALLOC_H__)
#define __XMALLOC_H__

/* The functions are actually macros so that we can pick up the file and line
   number information for debugging error messages without the user having to
   pass those in every time. */
#define xcalloc(n, size)        x_calloc((n), (size), __FILE__, __LINE__)
#define xmalloc(size)           x_malloc((size), __FILE__, __LINE__)
#define xrealloc(p, size)       x_realloc((p), (size), __FILE__, __LINE__)
#define xstrdup(p)              x_strdup((p), __FILE__, __LINE__)
#define xstrndup(p, size)       x_strndup((p), (size), __FILE__, __LINE__)

/*
 * Prototypes of functions
 */
void* x_malloc(size_t size, const char *file, int line);
void* x_calloc(size_t n, size_t size, const char *file, int line);
void* x_realloc(void *p, size_t size, const char *file, int line);
char* x_strdup(const char *s, const char *file, int line);
char* x_strndup(const char *s, size_t size, const char *file, int line);

#endif /* __XMALLOC_H__ */

Return to bug 2434

Lines 42-55 Link Here

(-)b/src/ckpass.c (-8 / +2 lines)
42	# define OPT_SHADOW ""	42	# define OPT_SHADOW ""
43	#endif	43	#endif
44		44
45	/* The functions are actually macros so that we can pick up the file and line	45	#include "messages.h"
46	number information for debugging error messages without the user having to	46	#include "xmalloc.h"
47	pass those in every time. */
48	#define xcalloc(n, size) x_calloc((n), (size), __FILE__, __LINE__)
49	#define xmalloc(size) x_malloc((size), __FILE__, __LINE__)
50	#define xrealloc(p, size) x_realloc((p), (size), __FILE__, __LINE__)
51	#define xstrdup(p) x_strdup((p), __FILE__, __LINE__)
52	#define xstrndup(p, size) x_strndup((p), (size), __FILE__, __LINE__)
53		47
54	#include <security/pam_appl.h>	48	#include <security/pam_appl.h>
55		49

Lines 43-56 Link Here

(-)b/src/ckpasswd.c (-8 / +2 lines)
43	# define OPT_SHADOW ""	43	# define OPT_SHADOW ""
44	#endif	44	#endif
45		45
46	/* The functions are actually macros so that we can pick up the file and line	46	#include "messages.h"
47	number information for debugging error messages without the user having to	47	#include "xmalloc.h"
48	pass those in every time. */
49	#define xcalloc(n, size) x_calloc((n), (size), __FILE__, __LINE__)
50	#define xmalloc(size) x_malloc((size), __FILE__, __LINE__)
51	#define xrealloc(p, size) x_realloc((p), (size), __FILE__, __LINE__)
52	#define xstrdup(p) x_strdup((p), __FILE__, __LINE__)
53	#define xstrndup(p, size) x_strndup((p), (size), __FILE__, __LINE__)
54		48
55	#include <security/pam_appl.h>	49	#include <security/pam_appl.h>
56		50

Lines 82-95 Link Here

(-)b/src/messages.c (-8 / +1 lines)
82	#include <pwd.h>	82	#include <pwd.h>
83	#include <grp.h>	83	#include <grp.h>
84		84
85	/* The functions are actually macros so that we can pick up the file and line	85	#include "xmalloc.h"
86	number information for debugging error messages without the user having to
87	pass those in every time. */
88	#define xcalloc(n, size) x_calloc((n), (size), __FILE__, __LINE__)
89	#define xmalloc(size) x_malloc((size), __FILE__, __LINE__)
90	#define xrealloc(p, size) x_realloc((p), (size), __FILE__, __LINE__)
91	#define xstrdup(p) x_strdup((p), __FILE__, __LINE__)
92	#define xstrndup(p, size) x_strndup((p), (size), __FILE__, __LINE__)
93		86
94	/* These are the currently-supported types of traces. */	87	/* These are the currently-supported types of traces. */
95	enum message_trace {	88	enum message_trace {

Line 0 Link Here

(-)b/src/messages.h (+18 lines)
	1	/* $Id: messages.h $
	2	*
	3	* Message and error reporting (possibly fatal).
	4	*
	5	*/
	6
	7	#if !defined(__MESSAGES_H__)
	8	#define __MESSAGES_H__
	9
	10	/* The reporting functions. The ones prefaced by "sys" add a colon, a space,
	11	and the results of strerror(errno) to the output and are intended for
	12	reporting failures of system calls. */
	13	extern void die(const char *, ...)
	14	__attribute__((__noreturn__, __format__(printf, 1, 2)));
	15	extern void sysdie(const char *, ...)
	16	__attribute__((__noreturn__, __format__(printf, 1, 2)));
	17
	18	#endif /* __MESSAGES_H__ */

Line 0 Link Here

(-)b/src/xmalloc.h (+28 lines)
	1	/* $Id: xmalloc.h $
	2	*
	3	* malloc routines with failure handling.
	4	*
	5	*/
	6
	7	#if !defined(__XMALLOC_H__)
	8	#define __XMALLOC_H__
	9
	10	/* The functions are actually macros so that we can pick up the file and line
	11	number information for debugging error messages without the user having to
	12	pass those in every time. */
	13	#define xcalloc(n, size) x_calloc((n), (size), __FILE__, __LINE__)
	14	#define xmalloc(size) x_malloc((size), __FILE__, __LINE__)
	15	#define xrealloc(p, size) x_realloc((p), (size), __FILE__, __LINE__)
	16	#define xstrdup(p) x_strdup((p), __FILE__, __LINE__)
	17	#define xstrndup(p, size) x_strndup((p), (size), __FILE__, __LINE__)
	18
	19	/*
	20	* Prototypes of functions
	21	*/
	22	void* x_malloc(size_t size, const char *file, int line);
	23	void* x_calloc(size_t n, size_t size, const char *file, int line);
	24	void* x_realloc(void p, size_t size, const char file, int line);
	25	char* x_strdup(const char s, const char file, int line);
	26	char* x_strndup(const char s, size_t size, const char file, int line);
	27
	28	#endif /* __XMALLOC_H__ */