[geany/geany] 7068e7: ctags: Remove useless Geany-specific tagEntryInfo::type field

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Thu, 28 Jul 2016 19:02:40 UTC
Commit:      7068e7c89219c333632ba9ce700f2ac992e55ad8
             https://github.com/geany/geany/commit/7068e7c89219c333632ba9ce700f2ac992e55ad8

Log Message:
-----------
ctags: Remove useless Geany-specific tagEntryInfo::type field

Original patch from Colomban Wendling, only converted to apply to the new
ctags location in the source tree.


Modified Paths:
--------------
    ctags/main/entry.h
    ctags/parsers/c.c

Modified: ctags/main/entry.h
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -72,7 +72,6 @@ typedef struct sTagEntryInfo {
 	const char *arglist; /* Argument list for functions and macros with arguments */
 	const char *varType;
     } extensionFields;		/* list of extension fields*/
-	int type;
 } tagEntryInfo;
 
 /*


Modified: ctags/parsers/c.c
9 lines changed, 4 insertions(+), 5 deletions(-)
===================================================================
@@ -1248,10 +1248,10 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type,
 		}
 	}
 
-	if ((TAG_FIELD == tag->type) || (TAG_MEMBER == tag->type) ||
-		(TAG_EXTERN_VAR == tag->type) || (TAG_TYPEDEF == tag->type) ||
-		(TAG_VARIABLE == tag->type) || (TAG_METHOD == tag->type) ||
-		(TAG_PROTOTYPE == tag->type) || (TAG_FUNCTION == tag->type))
+	if ((TAG_FIELD == type) || (TAG_MEMBER == type) ||
+		(TAG_EXTERN_VAR == type) || (TAG_TYPEDEF == type) ||
+		(TAG_VARIABLE == type) || (TAG_METHOD == type) ||
+		(TAG_PROTOTYPE == type) || (TAG_FUNCTION == type))
 	{
 		if (((TOKEN_NAME == st->firstToken->type) || isDataTypeKeyword(st->firstToken))
 			&& (0 != strcmp(vStringValue(st->firstToken->name), tag->name)))
@@ -1475,7 +1475,6 @@ static void makeTag (const tokenInfo *const token,
 		e.isFileScope = isFileScope;
 		e.kindName	= tagName (type);
 		e.kind		= tagLetter (type);
-		e.type = type;
 
 		findScopeHierarchy (scope, st);
 		addOtherFields (&e, type, token, st, scope);



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).