diff options
| -rw-r--r-- | lib/util/util_net.c | 3 | ||||
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/lib/util.c | 35 |
3 files changed, 4 insertions, 36 deletions
diff --git a/lib/util/util_net.c b/lib/util/util_net.c index 7718d0208f..ee57e9dd23 100644 --- a/lib/util/util_net.c +++ b/lib/util/util_net.c @@ -23,6 +23,9 @@ */ #include "includes.h" +#include "system/network.h" +#include "system/locale.h" +#include "system/filesys.h" /** Interpret an internet address or name into an IP address in 4 byte form. diff --git a/source3/include/proto.h b/source3/include/proto.h index cb21f895d1..cab294d8b1 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1237,7 +1237,7 @@ bool file_exist(const char *fname); bool socket_exist(const char *fname); time_t file_modtime(const char *fname); bool directory_exist_stat(char *dname,SMB_STRUCT_STAT *st); -bool directory_exist(char *dname); +bool directory_exist(const char *dname); SMB_OFF_T get_file_size(char *file_name); char *attrib_string(uint16 mode); void show_msg(char *buf); diff --git a/source3/lib/util.c b/source3/lib/util.c index 2f1dd83bb1..92b818b0aa 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1073,26 +1073,6 @@ static void *realloc_(void *ptr, size_t size) #endif /* PARANOID_MALLOC_CHECKER */ /**************************************************************************** - Type-safe malloc. -****************************************************************************/ - -void *malloc_array(size_t el_size, unsigned int count) -{ - if (count >= MAX_ALLOC_SIZE/el_size) { - return NULL; - } - - if (el_size == 0 || count == 0) { - return NULL; - } -#if defined(PARANOID_MALLOC_CHECKER) - return malloc_(el_size*count); -#else - return malloc(el_size*count); -#endif -} - -/**************************************************************************** Type-safe memalign ****************************************************************************/ @@ -1193,21 +1173,6 @@ void *Realloc(void *p, size_t size, bool free_old_on_error) } /**************************************************************************** - Type-safe realloc. -****************************************************************************/ - -void *realloc_array(void *p, size_t el_size, unsigned int count, bool free_old_on_error) -{ - if (count >= MAX_ALLOC_SIZE/el_size) { - if (free_old_on_error) { - SAFE_FREE(p); - } - return NULL; - } - return Realloc(p, el_size*count, free_old_on_error); -} - -/**************************************************************************** (Hopefully) efficient array append. ****************************************************************************/ |