diff options
| author | Volker Lendecke <vl@samba.org> | 2010-09-26 22:15:40 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-09-27 18:14:47 +0200 |
| commit | 8e02130c623fca4bf06baff6789b45d8782bf5b0 (patch) | |
| tree | d882003503cb90adb9d6b84bd58dde619f9488fb /lib | |
| parent | 84127dd50420a7d0e8f389d4af15d52fca6cd809 (diff) | |
| download | samba-8e02130c623fca4bf06baff6789b45d8782bf5b0.tar.gz samba-8e02130c623fca4bf06baff6789b45d8782bf5b0.tar.bz2 samba-8e02130c623fca4bf06baff6789b45d8782bf5b0.zip | |
Lift talloc_autofree_context() from OpenConfFile()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util/params.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/util/params.c b/lib/util/params.c index 80adc71fca..d589771f4d 100644 --- a/lib/util/params.c +++ b/lib/util/params.c @@ -488,7 +488,7 @@ static bool Parse( myFILE *InFile, return( true ); } /* Parse */ -static myFILE *OpenConfFile( const char *FileName ) +static myFILE *OpenConfFile(TALLOC_CTX *mem_ctx, const char *FileName ) /* ------------------------------------------------------------------------ ** * Open a configuration file. * @@ -502,7 +502,7 @@ static myFILE *OpenConfFile( const char *FileName ) const char *func = "params.c:OpenConfFile() -"; myFILE *ret; - ret = talloc(talloc_autofree_context(), myFILE); + ret = talloc(mem_ctx, myFILE); if (!ret) return NULL; ret->buf = file_load(FileName, &ret->size, 0, ret); @@ -543,7 +543,7 @@ bool pm_process( const char *FileName, myFILE *InFile; const char *func = "params.c:pm_process() -"; - InFile = OpenConfFile( FileName ); /* Open the config file. */ + InFile = OpenConfFile(talloc_autofree_context(), FileName); /* Open the config file. */ if( NULL == InFile ) return( false ); |