Remove extra whitespace, use public variable in IDL.

(This used to be commit bf08b682586f6b9a17d4ec3934836be957ef955c)

diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c
index 54a0676599fba6430f23c347f80415e0908f7de4..0465be689eb32984ab5ff43e44a2f6647357cdd4 100644 (file)
--- a/source4/lib/charset/charcnv.c
+++ b/source4/lib/charset/charcnv.c
@@ -677,7 +677,7 @@ _PUBLIC_ codepoint_t next_codepoint(struct smb_iconv_convenience *ic,
           with codepoints above 64k */
        olen = 2;
        outbuf = (char *)buf;
-       smb_iconv(descriptor,  &str, &ilen, &outbuf, &olen);
+       smb_iconv(descriptor, &str, &ilen, &outbuf, &olen);
        if (olen == 2) {
                olen = 4;
                outbuf = (char *)buf;

diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index 27f3a9955155044f5c904502f3f2f932ded13e5d..eaea6aa30e45600aef2999a444eb127c5131f771 100644 (file)
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -91,7 +91,7 @@ interface drsblobs {
 
        typedef [public,gensize,flag(NDR_PAHEX)] struct {
                /* this includes the 8 bytes of the repsFromToBlob header */
-               [value(ndr_size_repsFromTo1(r, ndr->flags)+8)] uint32 blobsize;
+               [value(ndr_size_repsFromTo1(this, ndr->flags)+8)] uint32 blobsize;
                uint32 consecutive_sync_failures;
                NTTIME_1sec last_success;
                NTTIME_1sec last_attempt;