s4:heimdal: import lorikeet-heimdal-201107150856 (commit 48936803fae4a2fb362c79365d31f420c917b85b)

4 files changed, 9 insertions, 9 deletions

diff --git a/source4/heimdal/lib/wind/ldap.c b/source4/heimdal/lib/wind/ldap.c
index 503ec75a9f..e7cab8eef3 100644
--- a/source4/heimdal/lib/wind/ldap.c
+++ b/source4/heimdal/lib/wind/ldap.c
@@ -61,7 +61,7 @@ _wind_ldap_case_exact_attribute(const uint32_t *tmp,
 	return WIND_ERR_OVERRUN;
     while(i < olen && tmp[i] == 0x20) /* skip initial spaces */
 	i++;
-	
+
     while (i < olen) {
 	if (tmp[i] == 0x20) {
 	    if (put_char(out, &o, 0x20, *out_len) ||
@@ -72,7 +72,7 @@ _wind_ldap_case_exact_attribute(const uint32_t *tmp,
 	} else {
 	    if (put_char(out, &o, tmp[i++], *out_len))
 		return WIND_ERR_OVERRUN;
-	}	
+	}
     }
     assert(o > 0);
 
diff --git a/source4/heimdal/lib/wind/normalize.c b/source4/heimdal/lib/wind/normalize.c
index 3c68ea8660..15274f6855 100644
--- a/source4/heimdal/lib/wind/normalize.c
+++ b/source4/heimdal/lib/wind/normalize.c
@@ -130,7 +130,7 @@ compat_decomp(const uint32_t *in, size_t in_len,
 	struct translation ts = {in[i]};
 	size_t sub_len = *out_len - o;
 	int ret;
-	
+
 	ret = hangul_decomp(in + i, in_len - i,
 			    out + o, &sub_len);
 	if (ret) {
diff --git a/source4/heimdal/lib/wind/stringprep.c b/source4/heimdal/lib/wind/stringprep.c
index ec4657665e..002bc72595 100644
--- a/source4/heimdal/lib/wind/stringprep.c
+++ b/source4/heimdal/lib/wind/stringprep.c
@@ -111,7 +111,7 @@ wind_stringprep(const uint32_t *in, size_t in_len,
     return ret;
 }
 
-const static struct {
+static const struct {
     const char *name;
     wind_profile_flags flags;
 } profiles[] = {
diff --git a/source4/heimdal/lib/wind/utf8.c b/source4/heimdal/lib/wind/utf8.c
index d16683645c..6907b3c9d3 100644
--- a/source4/heimdal/lib/wind/utf8.c
+++ b/source4/heimdal/lib/wind/utf8.c
@@ -183,7 +183,7 @@ wind_ucs4utf8(const uint32_t *in, size_t in_len, char *out, size_t *out_len)
 
     for (o = 0, i = 0; i < in_len; i++) {
 	ch = in[i];
-	
+
 	if (ch < 0x80) {
 	    len = 1;
 	} else if (ch < 0x800) {
@@ -194,7 +194,7 @@ wind_ucs4utf8(const uint32_t *in, size_t in_len, char *out, size_t *out_len)
 	    len = 4;
 	} else
 	    return WIND_ERR_INVALID_UTF32;
-	
+
 	o += len;
 
 	if (out) {
@@ -341,7 +341,7 @@ wind_ucs2write(const uint16_t *in, size_t in_len, unsigned int *flags,
      * first to the output data */
     if ((*flags) & WIND_RW_BOM) {
 	uint16_t bom = 0xfffe;
-	
+
 	if (len < 2)
 	    return WIND_ERR_OVERRUN;
 
@@ -462,14 +462,14 @@ wind_ucs2utf8(const uint16_t *in, size_t in_len, char *out, size_t *out_len)
 
     for (o = 0, i = 0; i < in_len; i++) {
 	ch = in[i];
-	
+
 	if (ch < 0x80) {
 	    len = 1;
 	} else if (ch < 0x800) {
 	    len = 2;
 	} else
 	    len = 3;
-	
+
 	o += len;
 
 	if (out) {