Use common util_file code.

2 files changed, 6 insertions, 6 deletions

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 58efa57bab..d646a79334 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -8385,7 +8385,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i
 		return -1;
 	}
 
-	lines = fd_lines_load(fd, &numlines, MAX_USERSHARE_FILE_SIZE);
+	lines = fd_lines_load(fd, &numlines, MAX_USERSHARE_FILE_SIZE, NULL);
 
 	close(fd);
 	if (lines == NULL) {
@@ -8400,7 +8400,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i
 	/* Should we allow printers to be shared... ? */
 	ctx = talloc_init("usershare_sd_xctx");
 	if (!ctx) {
-		file_lines_free(lines);
+		TALLOC_FREE(lines);
 		return 1;
 	}
 
@@ -8408,11 +8408,11 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i
 			iService, lines, numlines, &sharepath,
 			&comment, &psd, &guest_ok) != USERSHARE_OK) {
 		talloc_destroy(ctx);
-		file_lines_free(lines);
+		TALLOC_FREE(lines);
 		return -1;
 	}
 
-	file_lines_free(lines);
+	TALLOC_FREE(lines);
 
 	/* Everything ok - add the service possibly using a template. */
 	if (iService < 0) {
diff --git a/source3/param/params.c b/source3/param/params.c
index 478376c9e9..97db613fc4 100644
--- a/source3/param/params.c
+++ b/source3/param/params.c
@@ -118,7 +118,7 @@ static void myfile_close(myFILE *f)
 {
 	if (!f)
 		return;
-	SAFE_FREE(f->buf);
+	TALLOC_FREE(f->buf);
 	SAFE_FREE(f);
 }
 
@@ -525,7 +525,7 @@ static myFILE *OpenConfFile( const char *FileName )
 	if (!ret)
 		return NULL;
 
-	ret->buf = file_load(FileName, &ret->size, 0);
+	ret->buf = file_load(FileName, &ret->size, 0, NULL);
 	if( NULL == ret->buf ) {
 		DEBUG( lvl, ("%s Unable to open configuration file \"%s\":\n\t%s\n",
 			func, FileName, strerror(errno)) );