summaryrefslogtreecommitdiff
path: root/lib/util/params.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-19 14:27:08 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-19 14:27:08 +0200
commite09c0c1185b4a4ad1d28023549074875028f3e55 (patch)
tree158cd066a2dd19169748a6d94fc990953d49b6c9 /lib/util/params.c
parent33032d591f8e39edae0ce4b35ca1b6e25f04a04b (diff)
parent085e7b0b6cc882b31c11b6d6ea7834235588e1ed (diff)
downloadsamba-e09c0c1185b4a4ad1d28023549074875028f3e55.tar.gz
samba-e09c0c1185b4a4ad1d28023549074875028f3e55.tar.bz2
samba-e09c0c1185b4a4ad1d28023549074875028f3e55.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
Diffstat (limited to 'lib/util/params.c')
-rw-r--r--lib/util/params.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/util/params.c b/lib/util/params.c
index c03edec272..7af7ac7348 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -105,11 +105,6 @@ static int mygetc(myFILE *f)
return (int)( *(f->p++) & 0x00FF );
}
-static void myfile_close(myFILE *f)
-{
- talloc_free(f);
-}
-
/* -------------------------------------------------------------------------- **
* Functions...
*/
@@ -565,7 +560,7 @@ bool pm_process( const char *FileName,
if( NULL == InFile->bufr )
{
DEBUG(0,("%s memory allocation failure.\n", func));
- myfile_close(InFile);
+ talloc_free(InFile);
return( false );
}
result = Parse( InFile, sfunc, pfunc, userdata );
@@ -573,7 +568,7 @@ bool pm_process( const char *FileName,
InFile->bSize = 0;
}
- myfile_close(InFile);
+ talloc_free(InFile);
if( !result ) /* Generic failure. */
{