Remove silly safe_free() function which is a wrapper around SAFE_FREE().

Since it's a function it just sets the local pointer to NULL and basically
is an equivalent to free().

It also claims it's being used for callbacks but isn't used that way
anywhere.

3 files changed, 9 insertions, 10 deletions

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index c0e62eac19..1826fa88ed 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -280,7 +280,7 @@ static bool upgrade_to_version_3(void)
 	DEBUG(0,("upgrade_to_version_3: upgrading print tdb's to version 3\n"));
  
 	for (kbuf = tdb_firstkey(tdb_drivers); kbuf.dptr;
-			newkey = tdb_nextkey(tdb_drivers, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+			newkey = tdb_nextkey(tdb_drivers, kbuf), free(kbuf.dptr), kbuf=newkey) {
 
 		dbuf = tdb_fetch(tdb_drivers, kbuf);
 
@@ -807,7 +807,7 @@ int get_ntforms(nt_forms_struct **list)
 
 	for (kbuf = tdb_firstkey(tdb_forms);
 	     kbuf.dptr;
-	     newkey = tdb_nextkey(tdb_forms, kbuf), safe_free(kbuf.dptr), kbuf=newkey) 
+	     newkey = tdb_nextkey(tdb_forms, kbuf), free(kbuf.dptr), kbuf=newkey) 
 	{
 		if (strncmp((const char *)kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) != 0) 
 			continue;
@@ -1024,7 +1024,7 @@ int get_ntdrivers(fstring **list, const char *architecture, uint32 version)
 
 	for (kbuf = tdb_firstkey(tdb_drivers);
 	     kbuf.dptr;
-	     newkey = tdb_nextkey(tdb_drivers, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+	     newkey = tdb_nextkey(tdb_drivers, kbuf), free(kbuf.dptr), kbuf=newkey) {
 
 		if (strncmp((const char *)kbuf.dptr, key, strlen(key)) != 0)
 			continue;
@@ -3123,8 +3123,7 @@ static void map_single_multi_sz_into_ctr(REGVAL_CTR *ctr, const char *val_name,
 	regval_ctr_delvalue(ctr, val_name);
 	regval_ctr_addvalue(ctr, val_name, REG_MULTI_SZ, 
 			    (char *) conv_strs, str_size);	
-	safe_free(conv_strs);
-	
+	SAFE_FREE(conv_strs);
 }
 
 /****************************************************************************
diff --git a/source3/printing/pcap.c b/source3/printing/pcap.c
index b9e5ad56ad..a6bf52a0a4 100644
--- a/source3/printing/pcap.c
+++ b/source3/printing/pcap.c
@@ -179,7 +179,7 @@ void pcap_cache_reload(void)
 		goto done;
 	}
 
-	for (; (pcap_line = fgets_slash(NULL, 1024, pcap_file)) != NULL; safe_free(pcap_line)) {
+	for (; (pcap_line = fgets_slash(NULL, 1024, pcap_file)) != NULL; free(pcap_line)) {
 		char name[MAXPRINTERLEN+1];
 		char comment[62];
 		char *p, *q;
diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index 57590cc39e..523be77f35 100644
--- a/source3/printing/print_aix.c
+++ b/source3/printing/print_aix.c
@@ -49,7 +49,7 @@ bool aix_cache_reload(void)
 
 	iEtat = 0;
 	/* scan qconfig file for searching <printername>:	*/
-	for (;(line = fgets_slash(NULL, 1024, pfile)); safe_free(line)) {
+	for (;(line = fgets_slash(NULL, 1024, pfile)); free(line)) {
 		if (*line == '*' || *line == 0)
 			continue;
 
@@ -65,7 +65,7 @@ bool aix_cache_reload(void)
 				if (strcmp(p, "bsh") != 0) {
 					name = talloc_strdup(ctx, p);
 					if (!name) {
-						safe_free(line);
+						SAFE_FREE(line);
 						x_fclose(pfile);
 						TALLOC_FREE(ctx);
 						return false;
@@ -85,7 +85,7 @@ bool aix_cache_reload(void)
 				/* probably a good printer ???		*/
 				iEtat = 0;
 				if (!pcap_cache_add(name, NULL)) {
-					safe_free(line);
+					SAFE_FREE(line);
 					x_fclose(pfile);
 					TALLOC_FREE(ctx);
 					return false;
@@ -100,7 +100,7 @@ bool aix_cache_reload(void)
 				/* it's a good virtual printer */
 				iEtat = 0;
 				if (!pcap_cache_add(name, NULL)) {
-					safe_free(line);
+					SAFE_FREE(line);
 					x_fclose(pfile);
 					TALLOC_FREE(ctx);
 					return false;