mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-01 14:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Drop support for alloca().

Browse Source
This commit is contained in:
Juan Gomez 1999-06-11 18:56:28 +00:00
parent 2cb228a9ce
commit 34f068f131
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ac/alloca.h
View File

@ -12,6 +12,8 @@
#ifndef _AC_ALLOCA_H #ifndef _AC_ALLOCA_H
#define _AC_ALLOCA_H #define _AC_ALLOCA_H
#error "alloca() not supported, use malloc()"
/* AIX requires this to be the first thing in the file. */ /* AIX requires this to be the first thing in the file. */
#ifdef __GNUC__ #ifdef __GNUC__
# define alloca __builtin_alloca # define alloca __builtin_alloca

22
libraries/libldbm/ldbm.c
View File

@ -553,7 +553,6 @@ ldbm_errno( LDBM ldbm )
/* MMAPED DBM HASHING DATABASE */ /* MMAPED DBM HASHING DATABASE */
#include <ac/alloca.h>
#include <ac/string.h> #include <ac/string.h>
/* #define MDBM_DEBUG */ /* #define MDBM_DEBUG */
@ -690,7 +689,7 @@ ldbm_fetch( LDBM ldbm, Datum key )
#ifdef NO_NULL_KEY #ifdef NO_NULL_KEY
k.key.dsize = key.dsize + 1; k.key.dsize = key.dsize + 1;
k.key.dptr = alloca(k.key.dsize); k.key.dptr = malloc(k.key.dsize);
*(k.key.dptr) = 'l'; *(k.key.dptr) = 'l';
memcpy( (void *)(k.key.dptr + 1), key.dptr, key.dsize ); memcpy( (void *)(k.key.dptr + 1), key.dptr, key.dsize );
#else #else
@ -730,6 +729,10 @@ ldbm_fetch( LDBM ldbm, Datum key )
/* LDBM_UNLOCK; */ /* LDBM_UNLOCK; */
#ifdef NO_NULL_KEY
free(k.key.dptr);
#endif
return d; return d;
}/* Datum ldbm_fetch() */ }/* Datum ldbm_fetch() */
@ -754,7 +757,7 @@ ldbm_store( LDBM ldbm, Datum key, Datum data, int flags )
#ifdef NO_NULL_KEY #ifdef NO_NULL_KEY
int_key.dsize = key.dsize + 1; int_key.dsize = key.dsize + 1;
int_key.dptr = alloca( int_key.dsize ); int_key.dptr = malloc( int_key.dsize );
*(int_key.dptr) = 'l'; /* Must not be NULL !*/ *(int_key.dptr) = 'l'; /* Must not be NULL !*/
memcpy( (void *)(int_key.dptr + 1), key.dptr, key.dsize ); memcpy( (void *)(int_key.dptr + 1), key.dptr, key.dsize );
#else #else
@ -773,6 +776,10 @@ ldbm_store( LDBM ldbm, Datum key, Datum data, int flags )
fflush( stdout ); fflush( stdout );
#endif #endif
#ifdef NO_NULL_KEY
free(int_key.dptr);
#endif
return( rc ); return( rc );
}/* int ldbm_store() */ }/* int ldbm_store() */
@ -790,7 +797,7 @@ ldbm_delete( LDBM ldbm, Datum key )
#ifdef NO_NULL_KEY #ifdef NO_NULL_KEY
int_key.dsize = key.dsize + 1; int_key.dsize = key.dsize + 1;
int_key.dptr = alloca(int_key.dsize); int_key.dptr = malloc(int_key.dsize);
*(int_key.dptr) = 'l'; *(int_key.dptr) = 'l';
memcpy( (void *)(int_key.dptr + 1), key.dptr, key.dsize ); memcpy( (void *)(int_key.dptr + 1), key.dptr, key.dsize );
#else #else
@ -800,6 +807,9 @@ ldbm_delete( LDBM ldbm, Datum key )
rc = mdbm_delete( ldbm, int_key ); rc = mdbm_delete( ldbm, int_key );
/* LDBM_UNLOCK; */ /* LDBM_UNLOCK; */
#ifdef NO_NULL_KEY
free(int_key.dptr);
#endif
return( rc ); return( rc );
@ -825,7 +835,7 @@ ldbm_get_next( LDBM ldbm, kvpair (*fptr)(MDBM *, kvpair) )
/* LDBM_LOCK; */ /* LDBM_LOCK; */
in.key.dsize = sz; /* Assume first key in one pg */ in.key.dsize = sz; /* Assume first key in one pg */
in.key.dptr = alloca(sz); in.key.dptr = malloc(sz);
in.val.dptr = NULL; /* Don't need data just key */ in.val.dptr = NULL; /* Don't need data just key */
in.val.dsize = 0; in.val.dsize = 0;
@ -854,6 +864,8 @@ ldbm_get_next( LDBM ldbm, kvpair (*fptr)(MDBM *, kvpair) )
/* LDBM_UNLOCK; */ /* LDBM_UNLOCK; */
free(in.key.dptr);
return ret; return ret;
}/* static Datum ldbm_get_next() */ }/* static Datum ldbm_get_next() */