From 50270934510f52a3f31d234c8b10ab072952866e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Mon, 11 Feb 2008 20:41:12 +0000
Subject: [PATCH] use generated constant for length

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22580 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/wind/gen-normalize.py |  2 +-
 lib/wind/test-normalize.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/wind/gen-normalize.py b/lib/wind/gen-normalize.py
index 26258413e..7b0a0590f 100755
--- a/lib/wind/gen-normalize.py
+++ b/lib/wind/gen-normalize.py
@@ -70,7 +70,7 @@ normalize_h.file.write(
 #include <stddef.h>
 #include <stdint.h>
 
-#define MAX_LENGTH %u
+#define MAX_LENGTH_CANON %u
 
 struct translation {
   uint32_t key;
diff --git a/lib/wind/test-normalize.c b/lib/wind/test-normalize.c
index cc72103ee..2d52e5669 100644
--- a/lib/wind/test-normalize.c
+++ b/lib/wind/test-normalize.c
@@ -40,11 +40,10 @@
 #include <err.h>
 
 #include "windlocl.h"
+#include "normalize_table.h"
 
 RCSID("$Id$");
 
-#define MAX_LENGTH 20
-
 static size_t
 parse_vector(char *buf, uint32_t *v)
 {
@@ -56,8 +55,8 @@ parse_vector(char *buf, uint32_t *v)
     for(n = strtok_r(buf, " ", &last);
 	n != NULL;
 	n = strtok_r(NULL, " ", &last)) {
-	if (ret >= MAX_LENGTH) {
-	    errx(1, "increase MAX_LENGTH");
+	if (ret >= MAX_LENGTH_CANON) {
+	    errx(1, "increase MAX_LENGTH_CANON");
 	}
 	if (sscanf(n, "%x", &u) != 1) {
 	    errx(1, "failed to parse hex: %s", n);
@@ -73,9 +72,9 @@ test(char *buf)
 {
     char *last;
     char *c;
-    uint32_t in[MAX_LENGTH];
+    uint32_t in[MAX_LENGTH_CANON];
     size_t in_len;
-    uint32_t out[MAX_LENGTH];
+    uint32_t out[MAX_LENGTH_CANON];
     size_t out_len;
     uint32_t *tmp;
     size_t norm_len;
@@ -100,7 +99,7 @@ test(char *buf)
     if (c == NULL)
 	return 0;
 
-    norm_len = MAX_LENGTH;
+    norm_len = MAX_LENGTH_CANON;
     tmp = malloc(norm_len * sizeof(size_t));
     if (tmp == NULL)
 	err(1, "malloc");