From 9b261c008a395a323e0516f4cd3f3134aa050577 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 8 Jun 2009 19:06:16 +1000 Subject: 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 --- source4/heimdal/lib/wind/normalize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/heimdal/lib/wind/normalize.c') 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]; -- cgit