diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-06-08 19:06:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-06-12 07:45:48 +1000 |
| commit | 9b261c008a395a323e0516f4cd3f3134aa050577 (patch) | |
| tree | 91cf543ba7ccd560313bea52fa8678f0456e8485 /source4/heimdal/lib/wind | |
| parent | 5cef57ff7d899773a084d23838b7f18a83f6e79d (diff) | |
| download | samba-9b261c008a395a323e0516f4cd3f3134aa050577.tar.gz samba-9b261c008a395a323e0516f4cd3f3134aa050577.tar.bz2 samba-9b261c008a395a323e0516f4cd3f3134aa050577.zip | |
s4:heimdal: import lorikeet-heimdal-200906080040 (commit 904d0124b46eed7a8ad6e5b73e892ff34b6865ba)
Also including the supporting changes required to pass make test
A number of heimdal functions and constants have changed since we last
imported a tree (for the better, but inconvenient for us).
Andrew Bartlett
Diffstat (limited to 'source4/heimdal/lib/wind')
| -rw-r--r-- | source4/heimdal/lib/wind/normalize.c | 4 | ||||
| -rw-r--r-- | source4/heimdal/lib/wind/stringprep.c | 2 | ||||
| -rw-r--r-- | source4/heimdal/lib/wind/utf8.c | 2 | ||||
| -rw-r--r-- | source4/heimdal/lib/wind/wind_err.et | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/source4/heimdal/lib/wind/normalize.c b/source4/heimdal/lib/wind/normalize.c index c7af0e4958..3f71449fac 100644 --- a/source4/heimdal/lib/wind/normalize.c +++ b/source4/heimdal/lib/wind/normalize.c @@ -235,10 +235,9 @@ combine(const uint32_t *in, size_t in_len, int ostarter; unsigned o = 0; int old_cc; - int cc; for (i = 0; i < in_len;) { - while (i < in_len && (cc = _wind_combining_class(in[i])) != 0) { + while (i < in_len && _wind_combining_class(in[i]) != 0) { out[o++] = in[i++]; } if (i < in_len) { @@ -251,6 +250,7 @@ combine(const uint32_t *in, size_t in_len, while (i < in_len) { uint32_t comb; uint32_t v[2]; + int cc; v[0] = out[ostarter]; v[1] = in[i]; diff --git a/source4/heimdal/lib/wind/stringprep.c b/source4/heimdal/lib/wind/stringprep.c index 6e99cfc86b..aa04b3fd1d 100644 --- a/source4/heimdal/lib/wind/stringprep.c +++ b/source4/heimdal/lib/wind/stringprep.c @@ -107,7 +107,7 @@ wind_stringprep(const uint32_t *in, size_t in_len, return ret; } -static struct { +const static 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 f563b79107..ed944b4c7d 100644 --- a/source4/heimdal/lib/wind/utf8.c +++ b/source4/heimdal/lib/wind/utf8.c @@ -31,9 +31,7 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #include "windlocl.h" RCSID("$Id$"); diff --git a/source4/heimdal/lib/wind/wind_err.et b/source4/heimdal/lib/wind/wind_err.et index f90c252e7d..01c0d0f1c5 100644 --- a/source4/heimdal/lib/wind/wind_err.et +++ b/source4/heimdal/lib/wind/wind_err.et @@ -12,8 +12,8 @@ error_code NONE, "No error" error_code NO_PROFILE, "No such profile" error_code OVERRUN, "Buffer overrun" error_code UNDERUN, "Buffer underrun" -error_code LENGTH_NOT_MOD2, "Lenght not mod2" -error_code LENGTH_NOT_MOD4, "Lenght not mod4" +error_code LENGTH_NOT_MOD2, "Length not mod2" +error_code LENGTH_NOT_MOD4, "Length not mod4" error_code INVALID_UTF8, "Invalid UTF-8 combination in string" error_code INVALID_UTF16, "Invalid UTF-16 combination in string" error_code INVALID_UTF32, "Invalid UTF-32 combination in string" |