svn commit: samba r24173 - in branches/4.0-regwrite: . source/lib/registry/tools

[jelmer at samba.org]

Author: jelmer
Date: 2007-08-04 13:12:55 +0000 (Sat, 04 Aug 2007)
New Revision: 24173

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24173

Log:
Make regpatch.c use the new patch API.

Modified:
   branches/4.0-regwrite/
   branches/4.0-regwrite/source/lib/registry/tools/regpatch.c


Changeset:

Property changes on: branches/4.0-regwrite
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: Sun 2007-01-14 05:26:44.811000109 +0100
committer: Wilco Baan Hofman <wilco at baanhofman.nl>
properties: 
	branch-nick: 4.0-regwrite
	rebase-of: wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry

   + timestamp: Sun 2007-01-14 05:27:12.691999912 +0100
committer: Wilco Baan Hofman <wilco at baanhofman.nl>
properties: 
	branch-nick: 4.0-regwrite
	rebase-of: wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5

Name: bzr:revision-id:v3-trunk0
   - 11140 jelmer at samba.org-20070113195019-yrx40nap220myng0-svn3-upgrade
11142 jelmer at samba.org-20070113195431-nshumfy5z00cpnaj-svn3-upgrade
11143 jelmer at samba.org-20070113195555-am0swaxzsoxp05p0-svn3-upgrade
11144 wilco at baanhofman.nl-20070114042604-b7pwqobkrbmlbp8p-svn3-upgrade
11145 wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry-svn3-upgrade

   + 11140 jelmer at samba.org-20070113195019-yrx40nap220myng0-svn3-upgrade
11142 jelmer at samba.org-20070113195431-nshumfy5z00cpnaj-svn3-upgrade
11143 jelmer at samba.org-20070113195555-am0swaxzsoxp05p0-svn3-upgrade
11144 wilco at baanhofman.nl-20070114042604-b7pwqobkrbmlbp8p-svn3-upgrade
11145 wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry-svn3-upgrade
11146 wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5-svn3-upgrade


Modified: branches/4.0-regwrite/source/lib/registry/tools/regpatch.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/tools/regpatch.c	2007-08-04 13:12:50 UTC (rev 24172)
+++ branches/4.0-regwrite/source/lib/registry/tools/regpatch.c	2007-08-04 13:12:55 UTC (rev 24173)
@@ -32,7 +32,6 @@
 	const char *patch;
 	struct registry_context *h;
 	const char *remote = NULL;
-	struct reg_diff *diff;
 	WERROR error;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
@@ -63,13 +62,7 @@
 	patch = poptGetArg(pc);
 	poptFreeContext(pc);
 
-	diff = reg_diff_load(NULL, patch);
-	if (!diff) {
-		fprintf(stderr, "Unable to load registry patch from `%s'\n", patch);
-		return 1;
-	}
+	reg_diff_apply(patch, h);
 
-	reg_diff_apply(diff, h);
-
 	return 0;
 }