svn commit: samba r26563 - in branches/SAMBA_4_0: .
source/lib/registry source/lib/registry/tools
jelmer at samba.org
jelmer at samba.org
Sat Dec 22 05:02:50 GMT 2007
Author: jelmer
Date: 2007-12-22 05:02:48 +0000 (Sat, 22 Dec 2007)
New Revision: 26563
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26563
Log:
Fix reg_diff_apply argument order.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/lib/registry/patchfile.c
branches/SAMBA_4_0/source/lib/registry/patchfile.h
branches/SAMBA_4_0/source/lib/registry/registry.i
branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/lib/registry/patchfile.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/patchfile.c 2007-12-22 02:26:38 UTC (rev 26562)
+++ branches/SAMBA_4_0/source/lib/registry/patchfile.c 2007-12-22 05:02:48 UTC (rev 26563)
@@ -432,8 +432,7 @@
/**
* Apply diff to a registry context
*/
-_PUBLIC_ WERROR reg_diff_apply(const char *filename,
- struct registry_context *ctx)
+_PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, const char *filename)
{
struct reg_diff_callbacks callbacks;
Modified: branches/SAMBA_4_0/source/lib/registry/patchfile.h
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/patchfile.h 2007-12-22 02:26:38 UTC (rev 26562)
+++ branches/SAMBA_4_0/source/lib/registry/patchfile.h 2007-12-22 05:02:48 UTC (rev 26563)
@@ -36,8 +36,7 @@
WERROR (*done) (void *callback_data);
};
-WERROR reg_diff_apply (const char *filename,
- struct registry_context *ctx);
+WERROR reg_diff_apply(struct registry_context *ctx, const char *filename);
WERROR reg_generate_diff(struct registry_context *ctx1,
struct registry_context *ctx2,
Modified: branches/SAMBA_4_0/source/lib/registry/registry.i
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/registry.i 2007-12-22 02:26:38 UTC (rev 26562)
+++ branches/SAMBA_4_0/source/lib/registry/registry.i 2007-12-22 05:02:48 UTC (rev 26563)
@@ -97,11 +97,7 @@
struct registry_key **key);
WERROR get_predefined_key(uint32_t hkey_id, struct registry_key **key);
- WERROR apply_patchfile(const char *filename)
- {
- return reg_diff_apply(filename, $self);
- }
-
+ WERROR apply_patchfile(const char *filename);
WERROR mount_hive(struct hive_key *hive_key, uint32_t hkey_id,
const char **elements=NULL);
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2007-12-22 02:26:38 UTC (rev 26562)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2007-12-22 05:02:48 UTC (rev 26563)
@@ -65,7 +65,7 @@
poptFreeContext(pc);
- reg_diff_apply(patch, h);
+ reg_diff_apply(h, patch);
return 0;
}
More information about the samba-cvs
mailing list