summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-06-26 11:29:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:09:31 -0500
commit9bd4cfad47b8b2e1e60a49478c92cf8490802a18 (patch)
treef68fbea84e24a6af69f3b4084e0b938be80cfd25
parent4bd40183afd6d423ccbe5f43dac83bd299f86c50 (diff)
downloadsamba-9bd4cfad47b8b2e1e60a49478c92cf8490802a18.tar.gz
samba-9bd4cfad47b8b2e1e60a49478c92cf8490802a18.tar.bz2
samba-9bd4cfad47b8b2e1e60a49478c92cf8490802a18.zip
r16517: Get rid of pointless safe_free() (not SAFE_FREE()!) function.
(This used to be commit 6bc91497827a66af6d9adf26c689e9cc458d8ecf)
-rw-r--r--source4/lib/samba3/group.c2
-rw-r--r--source4/lib/util/util.c13
2 files changed, 1 insertions, 14 deletions
diff --git a/source4/lib/samba3/group.c b/source4/lib/samba3/group.c
index 0860c36e1f..fcf015de68 100644
--- a/source4/lib/samba3/group.c
+++ b/source4/lib/samba3/group.c
@@ -72,7 +72,7 @@ NTSTATUS samba3_read_grouptdb(const char *file, TALLOC_CTX *ctx, struct samba3_g
for (kbuf = tdb_firstkey(tdb);
kbuf.dptr;
- newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+ newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf=newkey) {
struct samba3_groupmapping map;
const char *k = (const char *)kbuf.dptr;
diff --git a/source4/lib/util/util.c b/source4/lib/util/util.c
index 5948cd7ecb..33215a81fb 100644
--- a/source4/lib/util/util.c
+++ b/source4/lib/util/util.c
@@ -253,19 +253,6 @@ _PUBLIC_ void become_daemon(BOOL Fork)
attach it to the logfile */
}
-
-/**
- Free memory, checks for NULL.
- Use directly SAFE_FREE()
- Exists only because we need to pass a function pointer somewhere --SSS
-**/
-
-_PUBLIC_ void safe_free(void *p)
-{
- SAFE_FREE(p);
-}
-
-
/**
Get my own name, return in malloc'ed storage.
**/