[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  0a154b9... s4:registry - "patchfile_preg.c" - assign a better type to the "i" counter variable
       via  aa9e782... s4:registry - "patchfile_preg.c" - make a SIVAL statement nicer
      from  7c54ff5... s3: re-run make samba3-idl.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0a154b940dc5657f78e3fe10fc239ed0b46c2eaa
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Apr 8 23:43:50 2010 +0200

    s4:registry - "patchfile_preg.c" - assign a better type to the "i" counter variable
    
    The "i" variable sums up "size" values which are of type "size_t". Therefore
    also "i" itself should be from this type.

commit aa9e782a4d27600096230be44e0e18971e503e20
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Apr 8 23:42:23 2010 +0200

    s4:registry - "patchfile_preg.c" - make a SIVAL statement nicer

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/registry/patchfile_preg.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/registry/patchfile_preg.c b/source4/lib/registry/patchfile_preg.c
index c68fb98..eb84b56 100644
--- a/source4/lib/registry/patchfile_preg.c
+++ b/source4/lib/registry/patchfile_preg.c
@@ -42,8 +42,7 @@ static WERROR preg_read_utf16(int fd, char *c)
 static WERROR preg_write_utf16(int fd, const char *string)
 {
 	codepoint_t v;
-	uint16_t i;
-	size_t size;
+	size_t i, size;
 
 	for (i = 0; i < strlen(string); i+=size) {
 		v = next_codepoint(&string[i], &size);
@@ -186,7 +185,7 @@ _PUBLIC_ WERROR reg_preg_diff_save(TALLOC_CTX *ctx, const char *filename,
 	}
 
 	strncpy(preg_header.hdr, "PReg", 4);
-	SIVAL(&preg_header, 4, 1);
+	SIVAL(&preg_header.version, 0, 1);
 	write(data->fd, (uint8_t *)&preg_header,8);
 
 	data->ctx = ctx;


-- 
Samba Shared Repository