sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Fix const, dupes.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-18 15:00:18 +02:00
parent 593549fc00
commit b3b6d8f3f9
3 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/util/util_net.c
View File

@ -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.

2
source3/include/proto.h
View File

@ -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);

35
source3/lib/util.c
View File

@ -1072,26 +1072,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
****************************************************************************/
@ -1192,21 +1172,6 @@ void *Realloc(void *p, size_t size, bool free_old_on_error)
return(ret);
}
/****************************************************************************
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.
****************************************************************************/