[geany/geany] 9c4c11: Remove some additional functions from ctags which we don't need in Geany - Commits

10 Sep 2016


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Wed, 03 Aug 2016 10:00:14 UTC
Commit:      9c4c113488f6d5743c79865c74f2d6d4e8dd875a
             https://github.com/geany/geany/commit/9c4c113488f6d5743c79865c74f2d6d4e8dd87...
Log Message:
-----------
Remove some additional functions from ctags which we don't need in Geany
These are useless for Geany and introduce some compilation errors at the
moment so drop them for now.
Modified Paths:
--------------
    ctags/main/main.c
    ctags/main/routines.c
Modified: ctags/main/main.c
102 lines changed, 0 insertions(+), 102 deletions(-)
===================================================================
@@ -103,108 +103,6 @@ extern boolean isDestinationStdout (void)
    return toStdout;
 }
-
-# if defined (WIN32)
-
-static boolean createTagsForMatchingEntries (char *const pattern)
-{
-	boolean resize = FALSE;
-	const size_t dirLength = baseFilename (pattern) - (char *) pattern;
-	vString *const filePath = vStringNew ();
-#if defined (HAVE_FINDFIRST)
-	struct ffblk fileInfo;
-	int result = findfirst (pattern, &fileInfo, FA_DIREC);
-	while (result == 0)
-	{
-		const char *const entryName = fileInfo.ff_name;
-
-		/*  We must not recurse into the directories "." or "..".
-		 */
-		if (strcmp (entryName, ".") != 0  &&  strcmp (entryName, "..") != 0)
-		{
-			vStringNCopyS (filePath, pattern, dirLength);
-			vStringCatS (filePath, entryName);
-			resize |= createTagsForEntry (vStringValue (filePath));
-		}
-		result = findnext (&fileInfo);
-	}
-#elif defined (HAVE__FINDFIRST)
-	struct _finddata_t fileInfo;
-	long hFile = _findfirst (pattern, &fileInfo);
-
-	if (hFile != -1L)
-	{
-		do
-		{
-			const char *const entryName = fileInfo.name;
-
-			/*  We must not recurse into the directories "." or "..".
-			 */
-			if (strcmp (entryName, ".") != 0  &&  strcmp (entryName, "..") != 0)
-			{
-				vStringNCopyS (filePath, pattern, dirLength);
-				vStringCatS (filePath, entryName);
-				resize |= createTagsForEntry (vStringValue (filePath));
-			}
-		} while (_findnext (hFile, &fileInfo) == 0);
-		_findclose (hFile);
-	}
-#endif
-
-	vStringDelete (filePath);
-	return resize;
-}
-
-#endif
-
-
-static boolean recurseIntoDirectory (const char *const dirName)
-{
-	boolean resize = FALSE;
-	if (isRecursiveLink (dirName))
-		verbose ("ignoring "%s" (recursive link)\n", dirName);
-	else if (! Option.recurse)
-		verbose ("ignoring "%s" (directory)\n", dirName);
-	else
-	{
-#if defined (HAVE_OPENDIR)
-		DIR *const dir = opendir (dirName);
-		if (dir == NULL)
-			error (WARNING | PERROR, "cannot recurse into directory "%s"",
-				   dirName);
-		else
-		{
-			struct dirent *entry;
-			verbose ("RECURSING into directory "%s"\n", dirName);
-			while ((entry = readdir (dir)) != NULL)
-			{
-				if (strcmp (entry->d_name, ".") != 0  &&
-					strcmp (entry->d_name, "..") != 0)
-				{
-					vString *filePath;
-					if (strcmp (dirName, ".") == 0)
-						filePath = vStringNewInit (entry->d_name);
-					else
-						filePath = combinePathAndFile (dirName, entry->d_name);
-					resize |= createTagsForEntry (vStringValue (filePath));
-					vStringDelete (filePath);
-				}
-			}
-			closedir (dir);
-		}
-#elif defined (WIN32)
-		vString *const pattern = vStringNew ();
-		verbose ("RECURSING into directory "%s"\n", dirName);
-		vStringCopyS (pattern, dirName);
-		vStringPut (pattern, OUTPUT_PATH_SEPARATOR);
-		vStringCatS (pattern, "*.*");
-		resize = createTagsForMatchingEntries (vStringValue (pattern));
-		vStringDelete (pattern);
-#endif  /* HAVE_OPENDIR */
-	}
-	return resize;
-}
-
 #if defined (HAVE_CLOCK)
 # define CLOCK_AVAILABLE
 # ifndef CLOCKS_PER_SEC
Modified: ctags/main/routines.c
4 lines changed, 0 insertions(+), 4 deletions(-)
===================================================================
@@ -181,10 +181,6 @@ extern int stat (const char *, struct stat *);
 extern int lstat (const char *, struct stat *);
 #endif
-#if 0
-static boolean createTagsForEntry (const char *const entryName);
-#endif
-
/*
 *   FUNCTION DEFINITIONS
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    