- Check for NULL tree->delete callback

- Add xstrdup() function
This commit is contained in:
Guus Sliepen 2000-11-21 09:13:59 +00:00
parent da9a1e8084
commit 9e9e1925b9
3 changed files with 23 additions and 2 deletions

View file

@ -17,13 +17,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: rbl.c,v 1.1.2.8 2000/11/20 19:12:10 guus Exp $
$Id: rbl.c,v 1.1.2.9 2000/11/21 09:13:59 guus Exp $
*/
#include "config.h"
#include <stdlib.h>
#include <xalloc.h>
#include "rbl.h"
#include <system.h>
/* Allocate a new rbl node */
rbl_t *new_rbl()
@ -34,6 +37,8 @@ rbl_t *new_rbl()
/* Free a rbl node */
void free_rbl(rbl_t *rbl)
{
if(rbl->data && rbl->tree->delete)
rbl->tree->delete(rbl->data);
free(rbl);
}
@ -507,7 +512,8 @@ void rbl_delete_rbltree(rbltree_t *tree)
for(rbl = tree->head; rbl; rbl = next)
{
next = rbl->next;
tree->delete(rbl->data);
if(tree->delete)
tree->delete(rbl->data);
}
tree->top = NULL;

View file

@ -22,3 +22,5 @@ void *xmalloc PARAMS ((size_t n));
void *xmalloc_and_zero PARAMS ((size_t n));
void *xcalloc PARAMS ((size_t n, size_t s));
void *xrealloc PARAMS ((void *p, size_t n));
char *xstrdup PARAMS ((char *s));

View file

@ -21,6 +21,7 @@
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
#if STDC_HEADERS
# include <stdlib.h>
@ -124,6 +125,18 @@ xrealloc (p, n)
return p;
}
/* Duplicate a string */
char *xstrdup(char *s)
{
char *p;
p = strdup(s);
if(!p)
xalloc_fail ((int)strlen(s));
return p;
}
#ifdef NOT_USED
/* Allocate memory for N elements of S bytes, with error checking. */