From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 7 Nov 2011 13:57:12 +0000 (+0100)
Subject: Make fr_tokens available from token.h or libradius.h
X-Git-Tag: release_3_0_0_beta0~521
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d45b1ff6eacdeaee8480880885f07fba223da0c1;p=thirdparty%2Ffreeradius-server.git

Make fr_tokens available from token.h or libradius.h
---

diff --git a/src/include/token.h b/src/include/token.h
index ab96fd5920b..b6097430e9e 100644
--- a/src/include/token.h
+++ b/src/include/token.h
@@ -71,6 +71,8 @@ typedef struct FR_NAME_NUMBER {
 	int		number;
 } FR_NAME_NUMBER;
 
+extern const FR_NAME_NUMBER fr_tokens[];
+
 int fr_str2int(const FR_NAME_NUMBER *table, const char *name, int def);
 int fr_substr2int(const FR_NAME_NUMBER *table, const char *name, int def, int len);
 const char *fr_int2str(const FR_NAME_NUMBER *table, int number,
diff --git a/src/lib/token.c b/src/lib/token.c
index 2e04ae390b8..14355e92723 100644
--- a/src/lib/token.c
+++ b/src/lib/token.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 
 #include <ctype.h>
 
-static const FR_NAME_NUMBER tokens[] = {
+const FR_NAME_NUMBER fr_tokens[] = {
 	{ "=~", T_OP_REG_EQ,	}, /* order is important! */
 	{ "!~", T_OP_REG_NE,	},
 	{ "{",	T_LCBRACE,	},
@@ -204,7 +204,7 @@ static FR_TOKEN getthing(const char **ptr, char *buf, int buflen, int tok,
  */
 int getword(const char **ptr, char *buf, int buflen)
 {
-	return getthing(ptr, buf, buflen, 0, tokens) == T_EOL ? 0 : 1;
+	return getthing(ptr, buf, buflen, 0, fr_tokens) == T_EOL ? 0 : 1;
 }
 
 /*
@@ -228,7 +228,7 @@ int getbareword(const char **ptr, char *buf, int buflen)
  */
 FR_TOKEN gettoken(const char **ptr, char *buf, int buflen)
 {
-	return getthing(ptr, buf, buflen, 1, tokens);
+	return getthing(ptr, buf, buflen, 1, fr_tokens);
 }
 
 /*
@@ -250,7 +250,7 @@ FR_TOKEN getstring(const char **ptr, char *buf, int buflen)
 		return gettoken(ptr, buf, buflen);
 	}
 
-	return getthing(ptr, buf, buflen, 0, tokens);
+	return getthing(ptr, buf, buflen, 0, fr_tokens);
 }
 
 /*
@@ -310,5 +310,5 @@ const char *fr_int2str(const FR_NAME_NUMBER *table, int number,
 
 const char *fr_token_name(int token)
 {
-	return fr_int2str(tokens, token, "???");
+	return fr_int2str(fr_tokens, token, "???");
 }