Update trie_natives.cpp (alliedmodders#1052)

rust2 · web-flow · commit fde732f66d5e · 2022-06-16T18:47:08.000-07:00
"Invalid map handle provided (%d)" error is very unclear when it appears in complex code.
diff --git a/amxmodx/trie_natives.cpp b/amxmodx/trie_natives.cpp
@@ -26,7 +26,7 @@ static cell AMX_NATIVE_CALL TrieClear(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 	t->map.clear();
@@ -40,7 +40,7 @@ static cell AMX_NATIVE_CALL TrieSetCell(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -76,7 +76,7 @@ static cell AMX_NATIVE_CALL TrieSetString(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -113,7 +113,7 @@ static cell AMX_NATIVE_CALL TrieSetArray(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -157,7 +157,7 @@ static cell AMX_NATIVE_CALL TrieGetCell(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -189,7 +189,7 @@ static cell AMX_NATIVE_CALL TrieGetString(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -236,7 +236,7 @@ static cell AMX_NATIVE_CALL TrieGetArray(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -297,7 +297,7 @@ static cell AMX_NATIVE_CALL TrieKeyExists(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -314,7 +314,7 @@ static cell AMX_NATIVE_CALL TrieDeleteKey(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -373,7 +373,7 @@ static cell AMX_NATIVE_CALL TrieGetSize(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -386,7 +386,7 @@ static cell AMX_NATIVE_CALL TrieSnapshotCreate(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -506,7 +506,7 @@ static cell AMX_NATIVE_CALL TrieIterCreate(AMX *amx, cell *params)
 
 	if (!handle)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[arg_handle]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[arg_handle]);
 		return 0;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static cell AMX_NATIVE_CALL TrieClear(AMX amx, cell params)`
`26`	`26`
`27`	`27`	`if (!t)`
`28`	`28`	`{`
`29`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`29`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`30`	`30`	`return 0;`
`31`	`31`	`}`
`32`	`32`	`t->map.clear();`
`@@ -40,7 +40,7 @@ static cell AMX_NATIVE_CALL TrieSetCell(AMX amx, cell params)`
`40`	`40`
`41`	`41`	`if (!t)`
`42`	`42`	`{`
`43`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`43`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`44`	`44`	`return 0;`
`45`	`45`	`}`
`46`	`46`
`@@ -76,7 +76,7 @@ static cell AMX_NATIVE_CALL TrieSetString(AMX amx, cell params)`
`76`	`76`
`77`	`77`	`if (!t)`
`78`	`78`	`{`
`79`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`79`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`80`	`80`	`return 0;`
`81`	`81`	`}`
`82`	`82`
`@@ -113,7 +113,7 @@ static cell AMX_NATIVE_CALL TrieSetArray(AMX amx, cell params)`
`113`	`113`
`114`	`114`	`if (!t)`
`115`	`115`	`{`
`116`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`116`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`117`	`117`	`return 0;`
`118`	`118`	`}`
`119`	`119`
`@@ -157,7 +157,7 @@ static cell AMX_NATIVE_CALL TrieGetCell(AMX amx, cell params)`
`157`	`157`
`158`	`158`	`if (!t)`
`159`	`159`	`{`
`160`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`160`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`161`	`161`	`return 0;`
`162`	`162`	`}`
`163`	`163`
`@@ -189,7 +189,7 @@ static cell AMX_NATIVE_CALL TrieGetString(AMX amx, cell params)`
`189`	`189`
`190`	`190`	`if (!t)`
`191`	`191`	`{`
`192`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`192`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`193`	`193`	`return 0;`
`194`	`194`	`}`
`195`	`195`
`@@ -236,7 +236,7 @@ static cell AMX_NATIVE_CALL TrieGetArray(AMX amx, cell params)`
`236`	`236`
`237`	`237`	`if (!t)`
`238`	`238`	`{`
`239`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`239`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`240`	`240`	`return 0;`
`241`	`241`	`}`
`242`	`242`
`@@ -297,7 +297,7 @@ static cell AMX_NATIVE_CALL TrieKeyExists(AMX amx, cell params)`
`297`	`297`
`298`	`298`	`if (!t)`
`299`	`299`	`{`
`300`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`300`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`301`	`301`	`return 0;`
`302`	`302`	`}`
`303`	`303`
`@@ -314,7 +314,7 @@ static cell AMX_NATIVE_CALL TrieDeleteKey(AMX amx, cell params)`
`314`	`314`
`315`	`315`	`if (!t)`
`316`	`316`	`{`
`317`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`317`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`318`	`318`	`return 0;`
`319`	`319`	`}`
`320`	`320`
`@@ -373,7 +373,7 @@ static cell AMX_NATIVE_CALL TrieGetSize(AMX amx, cell params)`
`373`	`373`
`374`	`374`	`if (!t)`
`375`	`375`	`{`
`376`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`376`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`377`	`377`	`return 0;`
`378`	`378`	`}`
`379`	`379`
`@@ -386,7 +386,7 @@ static cell AMX_NATIVE_CALL TrieSnapshotCreate(AMX amx, cell params)`
`386`	`386`
`387`	`387`	`if (!t)`
`388`	`388`	`{`
`389`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);`
	`389`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);`
`390`	`390`	`return 0;`
`391`	`391`	`}`
`392`	`392`
`@@ -506,7 +506,7 @@ static cell AMX_NATIVE_CALL TrieIterCreate(AMX amx, cell params)`
`506`	`506`
`507`	`507`	`if (!handle)`
`508`	`508`	`{`
`509`		`- LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[arg_handle]);`
	`509`	`+ LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[arg_handle]);`
`510`	`510`	`return 0;`
`511`	`511`	`}`
`512`	`512`