svn commit: samba r9807 - in branches/SAMBA_4_0/source/lib: .
jelmer at samba.org
jelmer at samba.org
Tue Aug 30 17:21:42 GMT 2005
Author: jelmer
Date: 2005-08-30 17:21:41 +0000 (Tue, 30 Aug 2005)
New Revision: 9807
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9807
Log:
Use talloc in fd_lines_load() and file_lines_load(). The return
value now can be freed using talloc(). I couldn't find the free_lines_list()
function that was supposed to free it before.
Modified:
branches/SAMBA_4_0/source/lib/util_file.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/util_file.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util_file.c 2005-08-30 16:30:11 UTC (rev 9806)
+++ branches/SAMBA_4_0/source/lib/util_file.c 2005-08-30 17:21:41 UTC (rev 9807)
@@ -271,7 +271,7 @@
/****************************************************************************
parse a buffer into lines
****************************************************************************/
-static char **file_lines_parse(char *p, size_t size, int *numlines)
+static char **file_lines_parse(char *p, size_t size, int *numlines, TALLOC_CTX *mem_ctx)
{
int i;
char *s, **ret;
@@ -282,11 +282,14 @@
if (s[0] == '\n') i++;
}
- ret = malloc_array_p(char *, i+2);
+ ret = talloc_array(mem_ctx, char *, i+2);
if (!ret) {
- SAFE_FREE(p);
+ talloc_free(p);
return NULL;
}
+
+ talloc_reference(ret, p);
+
memset(ret, 0, sizeof(ret[0])*(i+2));
if (numlines) *numlines = i;
@@ -306,33 +309,43 @@
/****************************************************************************
load a file into memory and return an array of pointers to lines in the file
-must be freed with file_lines_free().
+must be freed with talloc_free().
****************************************************************************/
char **file_lines_load(const char *fname, int *numlines, TALLOC_CTX *mem_ctx)
{
char *p;
+ char **lines;
size_t size;
p = file_load(fname, &size, mem_ctx);
if (!p) return NULL;
- return file_lines_parse(p, size, numlines);
+ lines = file_lines_parse(p, size, numlines, mem_ctx);
+
+ talloc_free(p);
+
+ return lines;
}
/****************************************************************************
load a fd into memory and return an array of pointers to lines in the file
-must be freed with file_lines_free(). If convert is true calls unix_to_dos on
+must be freed with talloc_free(). If convert is true calls unix_to_dos on
the list.
****************************************************************************/
char **fd_lines_load(int fd, int *numlines, TALLOC_CTX *mem_ctx)
{
char *p;
+ char **lines;
size_t size;
p = fd_load(fd, &size, mem_ctx);
if (!p) return NULL;
- return file_lines_parse(p, size, numlines);
+ lines = file_lines_parse(p, size, numlines, mem_ctx);
+
+ talloc_free(p);
+
+ return lines;
}
More information about the samba-cvs
mailing list