diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
| commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
| tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source3/intl/lang_tdb.c | |
| parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
| parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
| download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source3/intl/lang_tdb.c')
| -rw-r--r-- | source3/intl/lang_tdb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/intl/lang_tdb.c b/source3/intl/lang_tdb.c index 499b9eb87d..ac7e9dda40 100644 --- a/source3/intl/lang_tdb.c +++ b/source3/intl/lang_tdb.c @@ -33,14 +33,14 @@ static bool load_msg(const char *msg_file) char *msgid, *msgstr; TDB_DATA data; - lines = file_lines_load(msg_file, &num_lines,0); + lines = file_lines_load(msg_file, &num_lines, 0, NULL); if (!lines) { return False; } if (tdb_lockall(tdb) != 0) { - file_lines_free(lines); + TALLOC_FREE(lines); return False; } @@ -68,7 +68,7 @@ static bool load_msg(const char *msg_file) } } - file_lines_free(lines); + TALLOC_FREE(lines); tdb_unlockall(tdb); return True; |