sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

lib/util: remove samba specific talloc_get_type_abort()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2009-03-03 18:03:57 +01:00
parent b6f479d441
commit b00204a461
4 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/util/util.c
View File

@ -541,21 +541,6 @@ void *malloc_array(size_t el_size, unsigned int count)
return realloc_array(NULL, el_size, count, false);
}
_PUBLIC_ void *talloc_check_name_abort(const void *ptr, const char *name)
{
void *result;
result = talloc_check_name(ptr, name);
if (result != NULL)
return result;
DEBUG(0, ("Talloc type mismatch, expected %s, got %s\n",
name, talloc_get_name(ptr)));
smb_panic("talloc type mismatch");
/* Keep the compiler happy */
return NULL;
}
/**
Trim the specified elements off the front and back of a string.
**/

7
lib/util/util.h
View File

@ -767,13 +767,6 @@ bool pm_process( const char *fileName,
bool (*pfunc)(const char *, const char *, void *),
void *userdata);
/**
* Add-on to talloc_get_type
*/
_PUBLIC_ void *talloc_check_name_abort(const void *ptr, const char *name);
#define talloc_get_type_abort(ptr, type) \
(type *)talloc_check_name_abort(ptr, #type)
bool unmap_file(void *start, size_t size);
void print_asc(int level, const uint8_t *buf,int len);

4
source3/include/includes.h
View File

@ -584,10 +584,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "../lib/util/time.h"
#include "../lib/util/asn1.h"
/* And a little extension. Abort on type mismatch */
#define talloc_get_type_abort(ptr, type) \
(type *)talloc_check_name_abort(ptr, #type)
#include "ads.h"
#include "ads_dns.h"
#include "interfaces.h"

1
source3/include/proto.h
View File

@ -1173,7 +1173,6 @@ bool mask_match_search(const char *string, const char *pattern, bool is_case_sen
bool mask_match_list(const char *string, char **list, int listLen, bool is_case_sensitive);
bool unix_wild_match(const char *pattern, const char *string);
bool name_to_fqdn(fstring fqdn, const char *name);
void *talloc_check_name_abort(const void *ptr, const char *name);
void *talloc_append_blob(TALLOC_CTX *mem_ctx, void *buf, DATA_BLOB blob);
uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options);
pid_t procid_to_pid(const struct server_id *proc);