uemacs: Add ARRAY_SIZE macro so we can get rid of some hard coded calculations.

Signed-off-by: Thiago Farina <thiago.farina@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

eval.c

@@ -11,6 +11,7 @@
 #include "edef.h"
 #include "efunc.h"
 #include "evar.h"
+#include "util.h"
 
 void varinit(void)
 {				/* initialize the user variable list */
@@ -196,12 +197,12 @@ char *gtenv(char *vname)
 	int vnum;	/* ordinal number of var refrenced */
 
 	/* scan the list, looking for the referenced name */
-	for (vnum = 0; vnum < NEVARS; vnum++)
+	for (vnum = 0; vnum < ARRAY_SIZE(envars); vnum++)
 		if (strcmp(vname, envars[vnum]) == 0)
 			break;
 
 	/* return errorm on a bad reference */
-	if (vnum == NEVARS)
+	if (vnum == ARRAY_SIZE(envars))
 #if	ENVFUNC
 	{
 		char *ename = getenv(vname);
@@ -457,7 +458,7 @@ fvar:
 	switch (var[0]) {
 
 	case '$':		/* check for legal enviromnent var */
-		for (vnum = 0; vnum < NEVARS; vnum++)
+		for (vnum = 0; vnum < ARRAY_SIZE(envars); vnum++)
 			if (strcmp(&var[1], envars[vnum]) == 0) {
 				vtype = TKENV;
 				break;

evar.h

@@ -67,8 +67,6 @@ static char *envars[] = {
 #endif
 };
 
-#define	NEVARS	sizeof(envars) / sizeof(char *)
-
 /*	and its preprocesor definitions		*/
 
 #define	EVFILLCOL	0

util.h

@@ -0,0 +1,6 @@
+#ifndef UTIL_H_
+#define UTIL_H_
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+#endif  /* UTIL_H_ */