Use common util_file code.

3 files changed, 11 insertions, 11 deletions

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 850375e82b..13a6403b1c 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -3925,10 +3925,10 @@ static void map_to_os2_driver(fstring drivername)
 		return;
 	}
 
-	lines = file_lines_load(mapfile, &numlines,0);
+	lines = file_lines_load(mapfile, &numlines,0,NULL);
 	if (numlines == 0 || lines == NULL) {
 		DEBUG(0,("No entries in OS/2 driver map %s\n",mapfile));
-		SAFE_FREE(lines);
+		TALLOC_FREE(lines);
 		return;
 	}
 
@@ -3972,12 +3972,12 @@ static void map_to_os2_driver(fstring drivername)
 			DEBUG(3,("Mapped windows driver %s to os2 driver%s\n",drivername,os2_name));
 			set_last_from_to(drivername,os2_name);
 			fstrcpy(drivername,os2_name);
-			file_lines_free(lines);
+			TALLOC_FREE(lines);
 			return;
 		}
 	}
 
-	file_lines_free(lines);
+	TALLOC_FREE(lines);
 }
 
 /****************************************************************************
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index 0c05915bd8..5806b29206 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -238,7 +238,7 @@ static int generic_queue_get(const char *printer_name,
 	}
 	
 	numlines = 0;
-	qlines = fd_lines_load(fd, &numlines,0);
+	qlines = fd_lines_load(fd, &numlines,0,NULL);
 	close(fd);
 
 	/* turn the lpq output into a series of job structures */
@@ -247,7 +247,7 @@ static int generic_queue_get(const char *printer_name,
 	if (numlines && qlines) {
 		queue = SMB_MALLOC_ARRAY(print_queue_struct, numlines+1);
 		if (!queue) {
-			file_lines_free(qlines);
+			TALLOC_FREE(qlines);
 			*q = NULL;
 			return 0;
 		}
@@ -262,7 +262,7 @@ static int generic_queue_get(const char *printer_name,
 		}		
 	}
 
-	file_lines_free(qlines);
+	TALLOC_FREE(qlines);
         *q = queue;
 	return qcount;
 }
diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c
index 7e91d3a677..681b2bf459 100644
--- a/source3/printing/print_svid.c
+++ b/source3/printing/print_svid.c
@@ -59,12 +59,12 @@ bool sysv_cache_reload(void)
                 scheduler = file_lines_pload("/usr/bin/lpstat -r", NULL);
                 if(!strcmp(*scheduler,"scheduler is running")){
                         DEBUG(3,("No Printers found!!!\n"));
-			file_lines_free(scheduler);
+			TALLOC_FREE(scheduler);
                         return True;
                 }
                 else{
                         DEBUG(3,("Scheduler is not running!!!\n"));
-			file_lines_free(scheduler);
+			TALLOC_FREE(scheduler);
 			return False;
 		}
 #else
@@ -111,12 +111,12 @@ bool sysv_cache_reload(void)
 		
 		/* add it to the cache */
 		if (!pcap_cache_add(name, NULL)) {
-			file_lines_free(lines);
+			TALLOC_FREE(lines);
 			return False;
 		}
 	}
 
-	file_lines_free(lines);
+	TALLOC_FREE(lines);
 	return True;
 }