X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslurpd%2Fch_malloc.c;h=33523746a8ead8ef40f3a3e0229e5df03e7399ec;hb=42d7d6d7432b87d37bfb4beba489cc141ee2edf9;hp=298391e4f3c41ebae00739b16d5ca591374349c6;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap diff --git a/servers/slurpd/ch_malloc.c b/servers/slurpd/ch_malloc.c index 298391e4f3..33523746a8 100644 --- a/servers/slurpd/ch_malloc.c +++ b/servers/slurpd/ch_malloc.c @@ -1,5 +1,18 @@ -/* - * Copyright (c) 1996 Regents of the University of Michigan. +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2003 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* Portions Copyright (c) 1996 Regents of the University of Michigan. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -9,32 +22,44 @@ * software without specific prior written permission. This software * is provided ``as is'' without express or implied warranty. */ +/* ACKNOWLEDGEMENTS: + * This work was originally developed by the University of Michigan + * (as part of U-MICH LDAP). + */ + +#define CH_FREE 1 /* * ch_malloc.c - malloc() and friends, with check for NULL return. */ +#include "portable.h" + #include -#include -#include + +#include +#include + #include "../slapd/slap.h" +#ifndef CSRIMALLOC /* * Just like malloc, except we check the returned value and exit * if anything goes wrong. */ -char * +void * ch_malloc( - unsigned long size + ber_len_t size ) { - char *new; + void *new; - if ( (new = (char *) malloc( size )) == NULL ) { - fprintf( stderr, "malloc of %d bytes failed\n", size ); - exit( 1 ); + if ( (new = (void *) ber_memalloc( size )) == NULL ) { + fprintf( stderr, "malloc of %lu bytes failed\n", + (long) size ); + exit( EXIT_FAILURE ); } return( new ); @@ -47,21 +72,26 @@ ch_malloc( * Just like realloc, except we check the returned value and exit * if anything goes wrong. */ -char * +void * ch_realloc( - char *block, - unsigned long size + void *block, + ber_len_t size ) { - char *new; + void *new; if ( block == NULL ) { return( ch_malloc( size ) ); } - if ( (new = (char *) realloc( block, size )) == NULL ) { - fprintf( stderr, "realloc of %d bytes failed\n", size ); - exit( 1 ); + if ( size == 0 ) { + ch_free( block ); + } + + if ( (new = (void *) ber_memrealloc( block, size )) == NULL ) { + fprintf( stderr, "realloc of %lu bytes failed\n", + (long) size ); + exit( EXIT_FAILURE ); } return( new ); @@ -74,35 +104,55 @@ ch_realloc( * Just like calloc, except we check the returned value and exit * if anything goes wrong. */ -char * +void * ch_calloc( - unsigned long nelem, - unsigned long size + ber_len_t nelem, + ber_len_t size ) { - char *new; + void *new; - if ( (new = (char *) calloc( nelem, size )) == NULL ) { - fprintf( stderr, "calloc of %d elems of %d bytes failed\n", - nelem, size ); - exit( 1 ); + if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) { + fprintf( stderr, "calloc of %lu elems of %lu bytes failed\n", + (long) nelem, (long) size ); + exit( EXIT_FAILURE ); } return( new ); } +/* + * Just like strdup, except we check the returned value and exit + * if anything goes wrong. + */ +char * +ch_strdup( + const char *string +) +{ + char *new; + + if ( (new = ber_strdup( string )) == NULL ) { + fprintf( stderr, "ch_strdup: duplication of \"%s\" failed\n", + string ); + exit( EXIT_FAILURE ); + } + + return( new ); +} /* * Just like free, except we check to see if p is null. */ void ch_free( - char *p + void *p ) { if ( p != NULL ) { - free( p ); + ber_memfree( p ); } return; } - + +#endif