Use the ARRLEN macro in more places and remove an unused macro. (#5260)

red-001 · nerzhul · commit d988f9b7694d · 2017-02-18T15:24:49.000+01:00
diff --git a/src/clientiface.h b/src/clientiface.h
@@ -165,7 +165,6 @@ namespace con {
 	class Connection;
 }
 
-#define CI_ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 // Also make sure to update the ClientInterface::statenames
 // array when modifying these enums
diff --git a/src/keycode.cpp b/src/keycode.cpp
@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include "util/hex.h"
 #include "util/string.h"
+#include "util/basic_macros.h"
 
 class UnknownKeycode : public BaseException
 {
@@ -242,11 +243,10 @@ static const struct table_key table[] = {
 
 #undef N_
 
-#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 struct table_key lookup_keyname(const char *name)
 {
-	for (u16 i = 0; i < ARRAYSIZE(table); i++) {
+	for (u16 i = 0; i < ARRLEN(table); i++) {
 		if (strcmp(table[i].Name, name) == 0)
 			return table[i];
 	}
@@ -256,7 +256,7 @@ struct table_key lookup_keyname(const char *name)
 
 struct table_key lookup_keykey(irr::EKEY_CODE key)
 {
-	for (u16 i = 0; i < ARRAYSIZE(table); i++) {
+	for (u16 i = 0; i < ARRLEN(table); i++) {
 		if (table[i].Key == key)
 			return table[i];
 	}
@@ -268,7 +268,7 @@ struct table_key lookup_keykey(irr::EKEY_CODE key)
 
 struct table_key lookup_keychar(wchar_t Char)
 {
-	for (u16 i = 0; i < ARRAYSIZE(table); i++) {
+	for (u16 i = 0; i < ARRLEN(table); i++) {
 		if (table[i].Char == Char)
 			return table[i];
 	}

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,6 @@ namespace con {`
`165`	`165`	`class Connection;`
`166`	`166`	`}`
`167`	`167`
`168`		`-#define CI_ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))`
`169`	`168`
`170`	`169`	`// Also make sure to update the ClientInterface::statenames`
`171`	`170`	`// array when modifying these enums`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`24`	`24`	`#include "debug.h"`
`25`	`25`	`#include "util/hex.h"`
`26`	`26`	`#include "util/string.h"`
	`27`	`+#include "util/basic_macros.h"`
`27`	`28`
`28`	`29`	`class UnknownKeycode : public BaseException`
`29`	`30`	`{`
`@@ -242,11 +243,10 @@ static const struct table_key table[] = {`
`242`	`243`
`243`	`244`	`#undef N_`
`244`	`245`
`245`		`-#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))`
`246`	`246`
`247`	`247`	`struct table_key lookup_keyname(const char *name)`
`248`	`248`	`{`
`249`		`- for (u16 i = 0; i < ARRAYSIZE(table); i++) {`
	`249`	`+ for (u16 i = 0; i < ARRLEN(table); i++) {`
`250`	`250`	`if (strcmp(table[i].Name, name) == 0)`
`251`	`251`	`return table[i];`
`252`	`252`	`}`
`@@ -256,7 +256,7 @@ struct table_key lookup_keyname(const char *name)`
`256`	`256`
`257`	`257`	`struct table_key lookup_keykey(irr::EKEY_CODE key)`
`258`	`258`	`{`
`259`		`- for (u16 i = 0; i < ARRAYSIZE(table); i++) {`
	`259`	`+ for (u16 i = 0; i < ARRLEN(table); i++) {`
`260`	`260`	`if (table[i].Key == key)`
`261`	`261`	`return table[i];`
`262`	`262`	`}`
`@@ -268,7 +268,7 @@ struct table_key lookup_keykey(irr::EKEY_CODE key)`
`268`	`268`
`269`	`269`	`struct table_key lookup_keychar(wchar_t Char)`
`270`	`270`	`{`
`271`		`- for (u16 i = 0; i < ARRAYSIZE(table); i++) {`
	`271`	`+ for (u16 i = 0; i < ARRLEN(table); i++) {`
`272`	`272`	`if (table[i].Char == Char)`
`273`	`273`	`return table[i];`
`274`	`274`	`}`