summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-03-03 18:03:57 +0100
committerStefan Metzmacher <metze@samba.org>2009-03-03 18:07:33 +0100
commitb00204a46153a406a6c63792b1939bd3ad74ba71 (patch)
tree3d75260e43314488f568da77f34c12e47b2254a2
parentb6f479d4413511fbd742e7c8464cec67501f539c (diff)
downloadsamba-b00204a46153a406a6c63792b1939bd3ad74ba71.tar.gz
samba-b00204a46153a406a6c63792b1939bd3ad74ba71.tar.bz2
samba-b00204a46153a406a6c63792b1939bd3ad74ba71.zip
lib/util: remove samba specific talloc_get_type_abort()
metze
-rw-r--r--lib/util/util.c15
-rw-r--r--lib/util/util.h7
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/include/proto.h1
4 files changed, 0 insertions, 27 deletions
diff --git a/lib/util/util.c b/lib/util/util.c
index 1f31f55e8b..0148bdb00d 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -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.
**/
diff --git a/lib/util/util.h b/lib/util/util.h
index 1f6e3b193b..defef127d9 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -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);
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ca918b37df..b48a75526a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -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"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e1eab8dc16..78110161c5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -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);