svn commit: samba r24297 - in branches/4.0-regwrite: .
source/lib/registry
jelmer at samba.org
jelmer at samba.org
Fri Aug 10 03:15:28 GMT 2007
Author: jelmer
Date: 2007-08-10 03:15:11 +0000 (Fri, 10 Aug 2007)
New Revision: 24297
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24297
Log:
Fix generation of diffs.
Modified:
branches/4.0-regwrite/
branches/4.0-regwrite/source/lib/registry/patchfile.c
branches/4.0-regwrite/source/lib/registry/patchfile_dotreg.c
branches/4.0-regwrite/source/lib/registry/util.c
Changeset:
Property changes on: branches/4.0-regwrite
___________________________________________________________________
Name: bzr:revision-info
- timestamp: Fri 2007-08-10 04:32:48.729000092 +0200
committer: Jelmer Vernooij <jelmer at samba.org>
properties:
branch-nick: 4.0-regwrite
+ timestamp: Fri 2007-08-10 05:13:49.551000118 +0200
committer: Jelmer Vernooij <jelmer at samba.org>
properties:
branch-nick: 4.0-regwrite
Name: bzr:file-ids
- source/lib/registry/tests/diff.c diff.c-20070810002951-n58xalc7zkgl74k6-1
+
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
11146 wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5-svn3-upgrade
11147 wilco at baanhofman.nl-20070114042737-pwu8etpcs7lmwsms-svn3-upgrade
11148 wilco at baanhofman.nl-20070114043501-7g3vsn55rrr643z6-svn3-upgrade
11149 wilco at baanhofman.nl-20070114061526-fpg1tdt07virwgdk-svn3-upgrade
11150 wilco at baanhofman.nl-20070114133602-npguwp5mbuki5qlp-svn3-upgrade
11151 wilco at baanhofman.nl-20070114134318-79ylyc0gzh43xhqi-svn3-upgrade
11152 wilco at baanhofman.nl-20070114151541-6adzkudwihn30k9j-svn3-upgrade
11153 wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5-svn3-upgrade
11154 jelmer at samba.org-20070115165838-maz3nw52ijbba8rk-svn3-upgrade
11155 jelmer at samba.org-20070115170435-ert8ib689dhntd4p-svn3-upgrade
11156 jelmer at samba.org-20070115235410-krfav3ng4in38pkx-svn3-upgrade
11157 jelmer at samba.org-20070116222757-087aafuwkwfw4267-svn3-upgrade
11158 jelmer at samba.org-20070117013853-mfuqd1o46k44pk2d-svn3-upgrade
11159 jelmer at samba.org-20070117022606-q54g08ss30u86c5c-svn3-upgrade
11160 jelmer at samba.org-20070124130019-zt6jr00m7df9ur0m-svn3-upgrade
11161 jelmer at samba.org-20070124131946-1yxj4h6b092i8fwd-svn3-upgrade
11162 jelmer at samba.org-20070207151808-znhiwyn0cbnuah7z-svn3-upgrade
11163 jelmer at samba.org-20070208155904-yfb5n63xvx2w0kzz-svn3-upgrade
11164 jelmer at samba.org-20070208161920-v3bjwnhfqy4f6j6y-svn3-upgrade
11165 jelmer at samba.org-20070208171835-589fvhzi1hilvnan-svn3-upgrade
11166 jelmer at samba.org-20070210150222-mpmii8ak5w25btqc-svn3-upgrade
11167 jelmer at samba.org-20070210150533-khwd9jnhx7sqsbo6-svn3-upgrade
11168 jelmer at samba.org-20070212210015-vfey1bupuo237gtc-svn3-upgrade
11169 jelmer at samba.org-20070212210746-y5062ss2jjup80c0-svn3-upgrade
11170 jelmer at samba.org-20070212235354-htyicol9aj4sbk5l-svn3-upgrade
11171 jelmer at samba.org-20070221113700-q1sittkxd3a14jwk-svn3-upgrade
11172 jelmer at samba.org-20070227013556-0w8d95jjxfp1dstd-svn3-upgrade
11173 jelmer at samba.org-20070304145613-pufes2hspszib9qv-svn3-upgrade
11174 jelmer at samba.org-20070304184755-bgf26jhs49nt7s2u-svn3-upgrade
11175 jelmer at samba.org-20070304184903-gwgc00z1gtbmb01b-svn3-upgrade
11176 jelmer at samba.org-20070418170502-zvjkpzrur94nevvb-svn3-upgrade
11177 jelmer at samba.org-20070423140539-m81ruspga5mhbmdm-svn3-upgrade
11178 jelmer at samba.org-20070423141635-i6jhd2syudt5vry4-svn3-upgrade
11179 jelmer at samba.org-20070601151710-8xoranh864s3h1rs-svn3-upgrade
11180 jelmer at samba.org-20070602140325-y0nwln7k17vaj14o-svn3-upgrade
11181 jelmer at samba.org-20070602152504-3bij55pqljimwz31-svn3-upgrade
11182 jelmer at samba.org-20070608215652-x6m0ejk982bzfp76-svn3-upgrade
11183 jelmer at samba.org-20070610222652-11vkd62zyiyk971l-svn3-upgrade
11184 jelmer at samba.org-20070610234755-tpxetmbupthvqfp8-svn3-upgrade
11185 jelmer at samba.org-20070611134928-pew4ydd6a0qnh3iv-svn3-upgrade
11186 jelmer at samba.org-20070612165440-1x7k1m3nb1bzbal0-svn3-upgrade
11187 jelmer at samba.org-20070612200826-54acueedast7lnmr-svn3-upgrade
11188 jelmer at samba.org-20070612202736-meu8bltye0rberi6-svn3-upgrade
11189 jelmer at samba.org-20070612231137-i8mbl1sgmcfkb5vn-svn3-upgrade
11190 jelmer at samba.org-20070612234637-779h4pffu0ybx829-svn3-upgrade
11191 jelmer at samba.org-20070613001344-qkqechdlu867mozv-svn3-upgrade
11192 jelmer at samba.org-20070613205358-bw2nnemz6ringkd0-svn3-upgrade
11193 jelmer at samba.org-20070618211530-94qthtfumeziwpyy-svn3-upgrade
11194 jelmer at samba.org-20070618211731-l9oxx2wniv73urji-svn3-upgrade
11195 jelmer at samba.org-20070804133434-9p39k9jcud0lvrt9
11201 jelmer at samba.org-20070809211719-nurmykv7aqn34130
11202 jelmer at samba.org-20070809212644-bfcq0mzhwar5t7nv
11203 jelmer at samba.org-20070810001354-ukl0z19u46161efs
11204 jelmer at samba.org-20070810002410-z1fkrqkxqlcjho9r
11205 jelmer at samba.org-20070810023248-suyp56vzc2j4n0cg
+ 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
11147 wilco at baanhofman.nl-20070114042737-pwu8etpcs7lmwsms-svn3-upgrade
11148 wilco at baanhofman.nl-20070114043501-7g3vsn55rrr643z6-svn3-upgrade
11149 wilco at baanhofman.nl-20070114061526-fpg1tdt07virwgdk-svn3-upgrade
11150 wilco at baanhofman.nl-20070114133602-npguwp5mbuki5qlp-svn3-upgrade
11151 wilco at baanhofman.nl-20070114134318-79ylyc0gzh43xhqi-svn3-upgrade
11152 wilco at baanhofman.nl-20070114151541-6adzkudwihn30k9j-svn3-upgrade
11153 wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5-svn3-upgrade
11154 jelmer at samba.org-20070115165838-maz3nw52ijbba8rk-svn3-upgrade
11155 jelmer at samba.org-20070115170435-ert8ib689dhntd4p-svn3-upgrade
11156 jelmer at samba.org-20070115235410-krfav3ng4in38pkx-svn3-upgrade
11157 jelmer at samba.org-20070116222757-087aafuwkwfw4267-svn3-upgrade
11158 jelmer at samba.org-20070117013853-mfuqd1o46k44pk2d-svn3-upgrade
11159 jelmer at samba.org-20070117022606-q54g08ss30u86c5c-svn3-upgrade
11160 jelmer at samba.org-20070124130019-zt6jr00m7df9ur0m-svn3-upgrade
11161 jelmer at samba.org-20070124131946-1yxj4h6b092i8fwd-svn3-upgrade
11162 jelmer at samba.org-20070207151808-znhiwyn0cbnuah7z-svn3-upgrade
11163 jelmer at samba.org-20070208155904-yfb5n63xvx2w0kzz-svn3-upgrade
11164 jelmer at samba.org-20070208161920-v3bjwnhfqy4f6j6y-svn3-upgrade
11165 jelmer at samba.org-20070208171835-589fvhzi1hilvnan-svn3-upgrade
11166 jelmer at samba.org-20070210150222-mpmii8ak5w25btqc-svn3-upgrade
11167 jelmer at samba.org-20070210150533-khwd9jnhx7sqsbo6-svn3-upgrade
11168 jelmer at samba.org-20070212210015-vfey1bupuo237gtc-svn3-upgrade
11169 jelmer at samba.org-20070212210746-y5062ss2jjup80c0-svn3-upgrade
11170 jelmer at samba.org-20070212235354-htyicol9aj4sbk5l-svn3-upgrade
11171 jelmer at samba.org-20070221113700-q1sittkxd3a14jwk-svn3-upgrade
11172 jelmer at samba.org-20070227013556-0w8d95jjxfp1dstd-svn3-upgrade
11173 jelmer at samba.org-20070304145613-pufes2hspszib9qv-svn3-upgrade
11174 jelmer at samba.org-20070304184755-bgf26jhs49nt7s2u-svn3-upgrade
11175 jelmer at samba.org-20070304184903-gwgc00z1gtbmb01b-svn3-upgrade
11176 jelmer at samba.org-20070418170502-zvjkpzrur94nevvb-svn3-upgrade
11177 jelmer at samba.org-20070423140539-m81ruspga5mhbmdm-svn3-upgrade
11178 jelmer at samba.org-20070423141635-i6jhd2syudt5vry4-svn3-upgrade
11179 jelmer at samba.org-20070601151710-8xoranh864s3h1rs-svn3-upgrade
11180 jelmer at samba.org-20070602140325-y0nwln7k17vaj14o-svn3-upgrade
11181 jelmer at samba.org-20070602152504-3bij55pqljimwz31-svn3-upgrade
11182 jelmer at samba.org-20070608215652-x6m0ejk982bzfp76-svn3-upgrade
11183 jelmer at samba.org-20070610222652-11vkd62zyiyk971l-svn3-upgrade
11184 jelmer at samba.org-20070610234755-tpxetmbupthvqfp8-svn3-upgrade
11185 jelmer at samba.org-20070611134928-pew4ydd6a0qnh3iv-svn3-upgrade
11186 jelmer at samba.org-20070612165440-1x7k1m3nb1bzbal0-svn3-upgrade
11187 jelmer at samba.org-20070612200826-54acueedast7lnmr-svn3-upgrade
11188 jelmer at samba.org-20070612202736-meu8bltye0rberi6-svn3-upgrade
11189 jelmer at samba.org-20070612231137-i8mbl1sgmcfkb5vn-svn3-upgrade
11190 jelmer at samba.org-20070612234637-779h4pffu0ybx829-svn3-upgrade
11191 jelmer at samba.org-20070613001344-qkqechdlu867mozv-svn3-upgrade
11192 jelmer at samba.org-20070613205358-bw2nnemz6ringkd0-svn3-upgrade
11193 jelmer at samba.org-20070618211530-94qthtfumeziwpyy-svn3-upgrade
11194 jelmer at samba.org-20070618211731-l9oxx2wniv73urji-svn3-upgrade
11195 jelmer at samba.org-20070804133434-9p39k9jcud0lvrt9
11201 jelmer at samba.org-20070809211719-nurmykv7aqn34130
11202 jelmer at samba.org-20070809212644-bfcq0mzhwar5t7nv
11203 jelmer at samba.org-20070810001354-ukl0z19u46161efs
11204 jelmer at samba.org-20070810002410-z1fkrqkxqlcjho9r
11205 jelmer at samba.org-20070810023248-suyp56vzc2j4n0cg
11206 jelmer at samba.org-20070810031349-85nbiiuszqfhrtrj
Modified: branches/4.0-regwrite/source/lib/registry/patchfile.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/patchfile.c 2007-08-10 02:34:34 UTC (rev 24296)
+++ branches/4.0-regwrite/source/lib/registry/patchfile.c 2007-08-10 03:15:11 UTC (rev 24297)
@@ -118,12 +118,12 @@
}
if (oldkey != NULL) {
- error2 = reg_open_key(mem_ctx, oldkey, keyname1, &t2);
+ error2 = reg_open_key(mem_ctx, oldkey, keyname1, &t1);
if (W_ERROR_IS_OK(error2))
continue;
} else {
- t2 = NULL;
+ t1 = NULL;
error2 = WERR_DEST_NOT_FOUND;
}
@@ -139,7 +139,7 @@
callbacks->add_key(callback_data, tmppath);
W_ERROR_NOT_OK_RETURN(
- reg_open_key(mem_ctx, newkey, keyname1, &t1));
+ reg_open_key(mem_ctx, newkey, keyname1, &t2));
reg_generate_diff_key(t1, t2, tmppath, callbacks, callback_data);
talloc_free(tmppath);
@@ -160,8 +160,11 @@
return error1;
}
- error2 = reg_key_get_value_by_name(mem_ctx, oldkey, name,
+ if (oldkey != NULL) {
+ error2 = reg_key_get_value_by_name(mem_ctx, oldkey, name,
&type2, &contents2);
+ } else
+ error2 = WERR_DEST_NOT_FOUND;
if(!W_ERROR_IS_OK(error2) &&
!W_ERROR_EQUAL(error2, WERR_DEST_NOT_FOUND)) {
@@ -174,7 +177,7 @@
if (W_ERROR_IS_OK(error2) && data_blob_cmp(&contents1, &contents2) == 0)
continue;
- callbacks->set_value(callback_data, path, name, type2, contents2);
+ callbacks->set_value(callback_data, path, name, type1, contents1);
}
/* Values that were deleted */
Modified: branches/4.0-regwrite/source/lib/registry/patchfile_dotreg.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/patchfile_dotreg.c 2007-08-10 02:34:34 UTC (rev 24296)
+++ branches/4.0-regwrite/source/lib/registry/patchfile_dotreg.c 2007-08-10 03:15:11 UTC (rev 24297)
@@ -56,7 +56,8 @@
return WERR_OK;
}
-static WERROR reg_dotreg_diff_set_value(void *_data, const char *path, const char *value_name, uint32_t value_type, DATA_BLOB value)
+static WERROR reg_dotreg_diff_set_value(void *_data, const char *path,
+ const char *value_name, uint32_t value_type, DATA_BLOB value)
{
struct dotreg_data *data = _data;
Modified: branches/4.0-regwrite/source/lib/registry/util.c
===================================================================
--- branches/4.0-regwrite/source/lib/registry/util.c 2007-08-10 02:34:34 UTC (rev 24296)
+++ branches/4.0-regwrite/source/lib/registry/util.c 2007-08-10 03:15:11 UTC (rev 24297)
@@ -55,7 +55,8 @@
{
char *ret = NULL;
- if (data.length == 0) return talloc_strdup(mem_ctx, "");
+ if (data.length == 0)
+ return talloc_strdup(mem_ctx, "");
switch (type) {
case REG_EXPAND_SZ:
More information about the samba-cvs
mailing list