diff options
Diffstat (limited to 'source4/lib/registry/patchfile.c')
| -rw-r--r-- | source4/lib/registry/patchfile.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c index a01c3554c4..061d0fe52d 100644 --- a/source4/lib/registry/patchfile.c +++ b/source4/lib/registry/patchfile.c @@ -26,12 +26,10 @@ _PUBLIC_ WERROR reg_preg_diff_load(int fd, - struct smb_iconv_convenience *iconv_convenience, const struct reg_diff_callbacks *callbacks, void *callback_data); _PUBLIC_ WERROR reg_dotreg_diff_load(int fd, - struct smb_iconv_convenience *iconv_convenience, const struct reg_diff_callbacks *callbacks, void *callback_data); @@ -338,7 +336,6 @@ _PUBLIC_ WERROR reg_generate_diff(struct registry_context *ctx1, * Load diff file */ _PUBLIC_ WERROR reg_diff_load(const char *filename, - struct smb_iconv_convenience *iconv_convenience, const struct reg_diff_callbacks *callbacks, void *callback_data) { @@ -372,10 +369,10 @@ _PUBLIC_ WERROR reg_diff_load(const char *filename, #endif if (strncmp(hdr, "PReg", 4) == 0) { /* Must be a GPO Registry.pol file */ - return reg_preg_diff_load(fd, iconv_convenience, callbacks, callback_data); + return reg_preg_diff_load(fd, callbacks, callback_data); } else { /* Must be a normal .REG file */ - return reg_dotreg_diff_load(fd, iconv_convenience, callbacks, callback_data); + return reg_dotreg_diff_load(fd, callbacks, callback_data); } } @@ -531,7 +528,6 @@ static WERROR reg_diff_apply_del_all_values(void *_ctx, const char *key_name) * Apply diff to a registry context */ _PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, - struct smb_iconv_convenience *iconv_convenience, const char *filename) { struct reg_diff_callbacks callbacks; @@ -543,6 +539,5 @@ _PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, callbacks.del_all_values = reg_diff_apply_del_all_values; callbacks.done = NULL; - return reg_diff_load(filename, iconv_convenience, - &callbacks, ctx); + return reg_diff_load(filename, &callbacks, ctx); } |