Merge pull request #3724 from masatake/misc-fix

Misc fix
universal-ctags · May 14, 2023 · ee10ac3 · ee10ac3
2 parents da101ad + b9d073b
commit ee10ac3
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/main/field.c b/main/field.c
@@ -541,7 +541,7 @@ static fieldObject* getFieldObject(fieldType type)
 	return fieldObjects + type;
 }
 
-extern fieldType getFieldTypeForOption (char letter)
+extern fieldType getFieldTypeForLetter (char letter)
 {
 	unsigned int i;
 
@@ -1249,7 +1249,7 @@ extern bool enableField (fieldType type, bool state)
 	else
 		verbose ("enable field \"%s\"<%s>: %s\n",
 				 getFieldObject(type)->def->name,
-				 getLanguageName (getFieldOwner(type)),
+				 getLanguageName (getFieldLanguage(type)),
 				 (state? "yes": "no"));
 	return old;
 }
@@ -1259,7 +1259,7 @@ extern bool isCommonField (fieldType type)
 	return (FIELD_BUILTIN_LAST < type)? false: true;
 }
 
-extern int     getFieldOwner (fieldType type)
+extern langType getFieldLanguage (fieldType type)
 {
 	return getFieldObject(type)->language;
 }
@@ -1763,7 +1763,7 @@ static EsObject* getFieldValueForExtras (const tagEntryInfo *tag, const fieldDef
 		if (!isTagExtraBitMarked (tag, i))
 			continue;
 
-		langType lang = getXtagOwner (i);
+		langType lang = getXtagLanguage (i);
 		const char *lang_name = (lang == LANG_IGNORE)
 			? NULL
 			: getLanguageName (lang);

diff --git a/main/field.h b/main/field.h
@@ -83,7 +83,6 @@ typedef const char* (*fieldRenderer)(const tagEntryInfo *const,
 									 const char *,
 									 vString *);
 
-#define FIELD_LETTER_NO_USE '\0'
 struct sFieldDefinition {
 	/* letter, and ftype are initialized in the main part,
 	   not in a parser. */

diff --git a/main/field_p.h b/main/field_p.h
@@ -29,7 +29,7 @@
 *   FUNCTION PROTOTYPES
 */
 
-extern fieldType getFieldTypeForOption (char letter);
+extern fieldType getFieldTypeForLetter (char letter);
 
 /*
    `getFieldTypeForName' is for looking for a field not owned by any parser,
@@ -46,7 +46,10 @@ extern fieldType getFieldTypeForName (const char *name);
 extern fieldType getFieldTypeForNameAndLanguage (const char *fieldName, langType language);
 extern bool enableField (fieldType type, bool state);
 extern bool isCommonField (fieldType type);
-extern int     getFieldOwner (fieldType type);
+
+/* Return LANG_IGNORE if the field is a common field.*/
+extern langType getFieldLanguage (fieldType type);
+
 extern const char* getFieldDescription (fieldType type);
 extern const char* getFieldName (fieldType type);
 extern unsigned char getFieldLetter (fieldType type);

diff --git a/main/fmt.c b/main/fmt.c
@@ -201,7 +201,7 @@ static fmtElement** queueTagField (fmtElement **last, long width, bool truncatio
 	else
 	{
 		language = LANG_IGNORE;
-		ftype = getFieldTypeForOption (field_letter);
+		ftype = getFieldTypeForLetter (field_letter);
 	}
 
 	if (ftype == FIELD_UNKNOWN)

diff --git a/main/lregex.c b/main/lregex.c
@@ -3981,7 +3981,7 @@ static EsObject *lrop_markextra (OptVM *vm, EsObject *name)
 	if (xt == XTAG_UNKNOWN)
 		return OPTSCRIPT_ERR_UNKNOWNEXTRA;
 
-	langType lang = getXtagOwner (xt);
+	langType lang = getXtagLanguage (xt);
 	if (lang != LANG_IGNORE && e->langType != lang)
 	{
 		error (WARNING,

diff --git a/main/options.c b/main/options.c
@@ -1258,7 +1258,7 @@ static void processExcmdOption (
 static void resetXtags (langType lang, bool mode)
 {
 	for (unsigned int i = 0; i < countXtags (); i++)
-		if ((lang == LANG_AUTO) || (lang == getXtagOwner (i)))
+		if ((lang == LANG_AUTO) || (lang == getXtagLanguage (i)))
 			enableXtag (i, mode);
 }
 
@@ -1346,7 +1346,7 @@ static void processExtraTagsOption (
 static void resetFieldsOption (langType lang, bool mode)
 {
 	for (unsigned int i = 0; i < countFields (); ++i)
-		if ((lang == LANG_AUTO) || (lang == getFieldOwner (i)))
+		if ((lang == LANG_AUTO) || (lang == getFieldLanguage (i)))
 			enableField (i, mode);
 
 	if ((lang == LANG_AUTO || lang == LANG_IGNORE)&& !mode)
@@ -1419,7 +1419,7 @@ static void processFieldsOption (
 				vStringPut (longName, c);
 			else
 			{
-				t = getFieldTypeForOption (c);
+				t = getFieldTypeForLetter (c);
 				if (t == FIELD_UNKNOWN)
 					error(WARNING, "Unsupported parameter '%c' for \"%s\" option",
 					      c, option);

diff --git a/main/parse.c b/main/parse.c
@@ -4947,7 +4947,7 @@ extern bool makeFieldDescriptionsPseudoTags (const langType language,
 	bool written = false;
 	for (unsigned int i = 0; i < countFields (); i++)
 	{
-		if (getFieldOwner (i) == language
+		if (getFieldLanguage (i) == language
 			&& isFieldEnabled (i))
 		{
 			if (makeFieldDescriptionPseudoTag (language, i, pdesc))
@@ -4977,7 +4977,7 @@ extern bool makeExtraDescriptionsPseudoTags (const langType language,
 	bool written = false;
 	for (unsigned int i = 0; i < countXtags (); i++)
 	{
-		if (getXtagOwner (i) == language
+		if (getXtagLanguage (i) == language
 			&& isXtagEnabled (i))
 		{
 			if (makeExtraDescriptionPseudoTag (language, i, pdesc))

diff --git a/main/xtag.c b/main/xtag.c
@@ -282,7 +282,7 @@ extern bool isCommonXtag (xtagType type)
 	return (type < XTAG_COUNT)? true: false;
 }
 
-extern langType getXtagOwner (xtagType type)
+extern langType getXtagLanguage (xtagType type)
 {
 	return getXtagObject (type)->language;
 }

diff --git a/main/xtag_p.h b/main/xtag_p.h
@@ -37,7 +37,7 @@ extern bool isXtagFixed (xtagType type);
 extern bool isCommonXtag (xtagType type);
 
 /* Return LANG_IGNORE for common fields. */
-extern langType getXtagOwner (xtagType type);
+extern langType getXtagLanguage (xtagType type);
 
 extern const char* getXtagName (xtagType type);
 extern const char* getXtagDescription (xtagType type);