diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-12 17:34:43 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-12 17:34:43 +0200 |
| commit | 1b99d8fbb591bedb375c1251d5d29a5674e1b74a (patch) | |
| tree | 5e4cf4d115081057750349373184ad7df8894e61 /source4 | |
| parent | 652f0e601da0d1d2e2c8b9281bbee9fa399d9877 (diff) | |
| download | samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.tar.gz samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.tar.bz2 samba-1b99d8fbb591bedb375c1251d5d29a5674e1b74a.zip | |
Use common util_file code.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/auth/credentials/credentials_files.c | 2 | ||||
| -rw-r--r-- | source4/lib/registry/dir.c | 2 | ||||
| -rw-r--r-- | source4/lib/registry/regf.c | 2 | ||||
| -rw-r--r-- | source4/lib/tls/tls.c | 2 | ||||
| -rw-r--r-- | source4/torture/gentest.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index 364e80a3a6..8f4f8c9561 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -118,7 +118,7 @@ _PUBLIC_ bool cli_credentials_parse_file(struct cli_credentials *cred, const cha char **lines; int i, numlines; - lines = file_lines_load(file, &numlines, NULL); + lines = file_lines_load(file, &numlines, 0, NULL); if (lines == NULL) { diff --git a/source4/lib/registry/dir.c b/source4/lib/registry/dir.c index 449ee0f6ee..42946bceec 100644 --- a/source4/lib/registry/dir.c +++ b/source4/lib/registry/dir.c @@ -327,7 +327,7 @@ static WERROR reg_dir_get_value(TALLOC_CTX *mem_ctx, size_t size; char *contents; - contents = file_load(path, &size, mem_ctx); + contents = file_load(path, &size, 0, mem_ctx); talloc_free(path); if (contents == NULL) return WERR_BADFILE; diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c index 57a895aa00..dd3ff47b78 100644 --- a/source4/lib/registry/regf.c +++ b/source4/lib/registry/regf.c @@ -2066,7 +2066,7 @@ WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, const char *location, pull = tdr_pull_init(regf, regf->iconv_convenience); - pull->data.data = (uint8_t*)fd_load(regf->fd, &pull->data.length, regf); + pull->data.data = (uint8_t*)fd_load(regf->fd, &pull->data.length, 0, regf); if (pull->data.data == NULL) { DEBUG(0, ("Error reading data\n")); diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c index b298fb10cf..046c2b9036 100644 --- a/source4/lib/tls/tls.c +++ b/source4/lib/tls/tls.c @@ -421,7 +421,7 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx, struct loadparm_context * if (dhpfile && *dhpfile) { gnutls_datum_t dhparms; size_t size; - dhparms.data = (uint8_t *)file_load(dhpfile, &size, mem_ctx); + dhparms.data = (uint8_t *)file_load(dhpfile, &size, 0, mem_ctx); if (!dhparms.data) { DEBUG(0,("Failed to read DH Parms from %s\n", dhpfile)); diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 3bf3ad8b1b..74ece99422 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -3046,7 +3046,7 @@ static bool start_gentest(struct event_context *ev, /* generate the seeds - after this everything is deterministic */ if (options.use_preset_seeds) { int numops; - char **preset = file_lines_load(options.seeds_file, &numops, NULL); + char **preset = file_lines_load(options.seeds_file, &numops, 0, NULL); if (!preset) { printf("Failed to load %s - %s\n", options.seeds_file, strerror(errno)); exit(1); @@ -3193,7 +3193,7 @@ static bool split_unc_name(const char *unc, char **server, char **share) } if (ignore_file) { - options.ignore_patterns = file_lines_load(ignore_file, NULL, NULL); + options.ignore_patterns = file_lines_load(ignore_file, NULL, 0, NULL); } argv_new = discard_const_p(char *, poptGetArgs(pc)); |