main: use unsiged int as the return type of countXtags

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

main/entry.c

@@ -1111,7 +1111,7 @@ static tagEntryInfoX *copyTagEntry (const tagEntryInfo *const tag,
 
 	if (slot->extraDynamic)
 	{
-		int n = countXtags () - XTAG_COUNT;
+		unsigned int n = countXtags () - XTAG_COUNT;
 		slot->extraDynamic = xCalloc ((n / 8) + 1, uint8_t);
 		memcpy (slot->extraDynamic, tag->extraDynamic, (n / 8) + 1);
 	}
@@ -2017,8 +2017,8 @@ static void markTagExtraBitFull (tagEntryInfo *const tag, xtagType extra, bool m
 	else
 	{
 		Assert (extra < countXtags ());
-
-		int n = countXtags () - XTAG_COUNT;
+		Assert (XTAG_COUNT <= countXtags ());
+		unsigned int n = countXtags () - XTAG_COUNT;
 		tag->extraDynamic = xCalloc ((n / 8) + 1, uint8_t);
 		if (!tag->inCorkQueue)
 			PARSER_TRASH_BOX(tag->extraDynamic, eFree);

main/field.c

@@ -1072,9 +1072,9 @@ static const char *renderFieldExtras (const tagEntryInfo *const tag,
 				     const char *value CTAGS_ATTR_UNUSED,
 				     vString* b)
 {
-	int i;
+	unsigned int i;
 	bool hasExtra = false;
-	int c = countXtags();
+	unsigned int c = countXtags();
 
 	for (i = 0; i < c; i++)
 	{
@@ -1757,7 +1757,7 @@ static EsObject* getFieldValueForExtras (const tagEntryInfo *tag, const fieldDef
 
 	EsObject* a = opt_array_new ();
 
-	for (int i = 0; i < countXtags (); i++)
+	for (unsigned int i = 0; i < countXtags (); i++)
 	{
 		if (!isTagExtraBitMarked (tag, i))
 			continue;

main/options.c

@@ -1257,8 +1257,7 @@ static void processExcmdOption (
 
 static void resetXtags (langType lang, bool mode)
 {
-	int i;
-	for (i = 0; i < countXtags (); i++)
+	for (unsigned int i = 0; i < countXtags (); i++)
 		if ((lang == LANG_AUTO) || (lang == getXtagOwner (i)))
 			enableXtag (i, mode);
 }

main/parse.c

@@ -4975,7 +4975,7 @@ extern bool makeExtraDescriptionsPseudoTags (const langType language,
 											 const ptagDesc *pdesc)
 {
 	bool written = false;
-	for (int i = 0; i < countXtags (); i++)
+	for (unsigned int i = 0; i < countXtags (); i++)
 	{
 		if (getXtagOwner (i) == language
 			&& isXtagEnabled (i))

main/xtag.c

@@ -324,7 +324,7 @@ extern void initXtagObjects (void)
 	}
 }
 
-extern int countXtags (void)
+extern unsigned int countXtags (void)
 {
 	return xtagObjectUsed;
 }

main/xtag_p.h

@@ -43,7 +43,7 @@ extern const char* getXtagName (xtagType type);
 extern const char* getXtagDescription (xtagType type);
 
 extern void initXtagObjects (void);
-extern int countXtags (void);
+extern unsigned int countXtags (void);
 
 extern int defineXtag (xtagDefinition *def, langType language);
 extern xtagType nextSiblingXtag (xtagType type);