Rename getDirectiveNestLevel() to cppGetDirectiveNestLevel()

geany · Aug 7, 2016 · 4910e25 · 4910e25
1 parent 2638899
commit 4910e25
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ctags/main/lcpp.c b/ctags/main/lcpp.c
@@ -107,7 +107,7 @@ extern boolean cppIsBraceFormat (void)
 	return BraceFormat;
 }
 
-extern unsigned int getDirectiveNestLevel (void)
+extern unsigned int cppGetDirectiveNestLevel (void)
 {
 	return Cpp.directive.nestLevel;
 }

diff --git a/ctags/main/lcpp.h b/ctags/main/lcpp.h
@@ -35,7 +35,8 @@
 *   FUNCTION PROTOTYPES
 */
 extern boolean cppIsBraceFormat (void);
-extern unsigned int getDirectiveNestLevel (void);
+extern unsigned int cppGetDirectiveNestLevel (void);
+
 extern void cppInit (const boolean state, const boolean hasAtLiteralStrings,
                      const boolean hasCxxRawLiteralStrings,
                      const kindOption *defineMacroKind);

diff --git a/ctags/parsers/c.c b/ctags/parsers/c.c
@@ -1653,7 +1653,7 @@ static void skipToMatch (const char *const pair)
 {
 	const boolean braceMatching = (boolean) (strcmp ("{}", pair) == 0);
 	const boolean braceFormatting = (boolean) (cppIsBraceFormat () && braceMatching);
-	const unsigned int initialLevel = getDirectiveNestLevel ();
+	const unsigned int initialLevel = cppGetDirectiveNestLevel ();
 	const int begin = pair [0], end = pair [1];
 	const unsigned long inputLineNumber = getInputLineNumber ();
 	int matchLevel = 1;
@@ -1665,7 +1665,7 @@ static void skipToMatch (const char *const pair)
 		if (c == begin)
 		{
 			++matchLevel;
-			if (braceFormatting  &&  getDirectiveNestLevel () != initialLevel)
+			if (braceFormatting  &&  cppGetDirectiveNestLevel () != initialLevel)
 			{
 				skipToFormattedBraceMatch ();
 				break;
@@ -1674,7 +1674,7 @@ static void skipToMatch (const char *const pair)
 		else if (c == end)
 		{
 			--matchLevel;
-			if (braceFormatting  &&  getDirectiveNestLevel () != initialLevel)
+			if (braceFormatting  &&  cppGetDirectiveNestLevel () != initialLevel)
 			{
 				skipToFormattedBraceMatch ();
 				break;