geany · b4n · Sep 10, 2016 · Jul 28, 2016 · Jul 28, 2016 · Jul 28, 2016
diff --git a/ctags/main/args.c b/ctags/main/args.c
@@ -1,23 +1,23 @@
 /*
-*
-*   Copyright (c) 1999-2001, Darren Hiebert
+*   Copyright (c) 1999-2002, Darren Hiebert
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   This module contains functions for reading command line arguments.
 */
 
 /*
 *   INCLUDE FILES
 */
-#include "general.h"    /* must always come first */
+#include "general.h"  /* must always come first */
 
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
 #include "args.h"
+#include "debug.h"
 #include "routines.h"
 
 /*

diff --git a/ctags/main/args.h b/ctags/main/args.h
@@ -1,19 +1,20 @@
 /*
-*
-*   Copyright (c) 1999-2001, Darren Hiebert
+*   Copyright (c) 1999-2002, Darren Hiebert
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   Defines external interface to command line argument reading.
 */
-#ifndef _ARGS_H
-#define _ARGS_H
+#ifndef CTAGS_MAIN_ARGS_H
+#define CTAGS_MAIN_ARGS_H
 
 /*
 *   INCLUDE FILES
 */
-#include "general.h"    /* must always come first */
+#include "general.h"  /* must always come first */
+
+#include <stdio.h>
 
 /*
 *   DATA DECLARATIONS
@@ -53,6 +54,6 @@ extern void argSetLineMode (Arguments* const current);
 extern void argForth (Arguments* const current);
 extern void argDelete (Arguments* const current);
 
-#endif  /* _ARGS_H */
+#endif  /* CTAGS_MAIN_ARGS_H */
 
 /* vi:set tabstop=4 shiftwidth=4: */
diff --git a/ctags/main/ctags.h b/ctags/main/ctags.h
@@ -1,13 +1,15 @@
 /*
-*   Copyright (c) 1996-2001, Darren Hiebert
+*   Copyright (c) 1996-2002, Darren Hiebert
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   Program definitions
 */
-#ifndef _CTAGS_H
-#define _CTAGS_H
+#ifndef CTAGS_MAIN_CTAGS_H
+#define CTAGS_MAIN_CTAGS_H
+
+#include "general.h"
 
 /*
 *   MACROS
@@ -20,6 +22,6 @@
 #define AUTHOR_NAME     "Darren Hiebert"
 #define AUTHOR_EMAIL    "darren@hiebert.com"
 
-#endif  /* _CTAGS_H */
+#endif	/* CTAGS_MAIN_CTAGS_H */
 
 /* vi:set tabstop=4 shiftwidth=4: */
diff --git a/ctags/main/entry.c b/ctags/main/entry.c
@@ -1,29 +1,28 @@
 /*
-*
-*   Copyright (c) 1996-2001, Darren Hiebert
+*   Copyright (c) 1996-2002, Darren Hiebert
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   This module contains functions for creating tag entries.
 */
 
 /*
 *   INCLUDE FILES
 */
-#include "general.h"    /* must always come first */
+#include "general.h"  /* must always come first */
 
 #include <string.h>
-#include <ctype.h>      /* to define isspace () */
+#include <ctype.h>        /* to define isspace () */
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 
 #if defined (HAVE_SYS_TYPES_H)
-# include <sys/types.h>     /* to declare off_t on some hosts */
+# include <sys/types.h>	  /* to declare off_t on some hosts */
 #endif
 #if defined (HAVE_TYPES_H)
-# include <types.h>         /* to declare off_t on some hosts */
+# include <types.h>       /* to declare off_t on some hosts */
 #endif
 
 
@@ -159,14 +158,14 @@ static void addPseudoTags (void)
 	}
 }
 
-static void updateSortedFlag (const char *const line,
-							  MIO *const mio, MIOPos startOfLine)
+static void updateSortedFlag (
+		const char *const line, MIO *const mio, MIOPos startOfLine)
 {
 	const char *const tab = strchr (line, '\t');
 
 	if (tab != NULL)
 	{
-		const long boolOffset = tab - line + 1;         /* where it should be */
+		const long boolOffset = tab - line + 1;  /* where it should be */
 
 		if (line [boolOffset] == '0'  ||  line [boolOffset] == '1')
 		{
@@ -231,7 +230,7 @@ static long unsigned int updatePseudoTags (MIO *const mio)
 		}
 		line = readLineRaw (TagFile.vLine, mio);
 	}
-	while (line != NULL)                        /* skip to end of file */
+	while (line != NULL)  /* skip to end of file */
 	{
 		++linesRead;
 		line = readLineRaw (TagFile.vLine, mio);

diff --git a/ctags/main/entry.h b/ctags/main/entry.h
@@ -1,19 +1,18 @@
 /*
-*
-*   Copyright (c) 1998-2001, Darren Hiebert
+*   Copyright (c) 1998-2002, Darren Hiebert
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   External interface to entry.c
 */
-#ifndef _ENTRY_H
-#define _ENTRY_H
+#ifndef CTAGS_MAIN_ENTRY_H
+#define CTAGS_MAIN_ENTRY_H
 
 /*
 *   INCLUDE FILES
 */
-#include "general.h"    /* must always come first */
+#include "general.h"  /* must always come first */
 
 #include "mio.h"
 #include "vstring.h"
@@ -96,6 +95,6 @@ extern void endEtagsFile (const char *const name);
 extern void makeTagEntry (const tagEntryInfo *const tag);
 extern void initTagEntry (tagEntryInfo *const e, const char *const name, const kindOption *kind);
 
-#endif  /* _ENTRY_H */
+#endif  /* CTAGS_MAIN_ENTRY_H */
 
 /* vi:set tabstop=4 shiftwidth=4: */
diff --git a/ctags/main/general.h b/ctags/main/general.h
@@ -1,19 +1,18 @@
 /*
-*
-*   Copyright (c) 1998-2001, Darren Hiebert
+*   Copyright (c) 1998-2003, Darren Hiebert
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   Provides the general (non-ctags-specific) environment assumed by all.
 */
-#ifndef _GENERAL_H
-#define _GENERAL_H
+#ifndef CTAGS_MAIN_GENERAL_H
+#define CTAGS_MAIN_GENERAL_H
 
 /*
 *   INCLUDE FILES
 */
-#ifdef HAVE_CONFIG_H
+#if defined (HAVE_CONFIG_H)
 # include <config.h>
 #endif
 #ifdef macintosh
@@ -151,6 +150,6 @@ extern void *unlink (const char *);
 extern char *getenv (const char *);
 #endif
 
-#endif  /* _GENERAL_H */
+#endif  /* CTAGS_MAIN_GENERAL_H */
 
 /* vi:set tabstop=4 shiftwidth=4: */
diff --git a/ctags/main/lcpp.c b/ctags/main/lcpp.c
@@ -166,7 +166,7 @@ extern void cppEndStatement (void)
 *   directives and may emit a tag for #define directives.
 */
 
-/*  This puts a character back into the input queue for the source File.
+/*  This puts a character back into the input queue for the input File.
  *  Up to two characters may be ungotten.
  */
 extern void cppUngetc (const int c)

diff --git a/ctags/main/lregex.c b/ctags/main/lregex.c
@@ -2,11 +2,11 @@
 *   Copyright (c) 2000-2003, Darren Hiebert
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   This module contains functions for applying regular expression matching.
 *
-*   The code for utlizing the Gnu regex package with regards to processing the
+*   The code for utilizing the Gnu regex package with regards to processing the
 *   regex option and checking for regex matches was adapted from routines in
 *   Gnu etags.
 */
@@ -91,6 +91,7 @@ static int SetUpper = -1;  /* upper language index in list */
 *   FUNCTION DEFINITIONS
 */
 
+
 static void clearPatternSet (const langType language)
 {
 	if (language <= SetUpper)

diff --git a/ctags/main/main.c b/ctags/main/main.c
@@ -71,7 +71,7 @@
 /*
 *   MACROS
 */
-#define plural(value)           (((unsigned long)(value) == 1L) ? "" : "s")
+#define plural(value)  (((unsigned long)(value) == 1L) ? "" : "s")
 
 /*
 *   DATA DEFINITIONS

diff --git a/ctags/main/nestlevel.c b/ctags/main/nestlevel.c
@@ -3,7 +3,7 @@
 *   Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   Defines external interface to scope nesting levels for tags.
 */

diff --git a/ctags/main/nestlevel.h b/ctags/main/nestlevel.h
@@ -3,12 +3,12 @@
 *   Copyright 2009-2011 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   Defines external interface to scope nesting levels for tags.
 */
-#ifndef _NESTLEVEL_H
-#define _NESTLEVEL_H
+#ifndef CTAGS_MAIN_NESTLEVEL_H
+#define CTAGS_MAIN_NESTLEVEL_H
 
 /*
 *   INCLUDE FILES
@@ -47,6 +47,6 @@ extern void nestingLevelsPush(NestingLevels *nls,
 extern void nestingLevelsPop(NestingLevels *nls);
 extern NestingLevel *nestingLevelsGetCurrent(NestingLevels *nls);
 
-#endif  /* _NESTLEVEL_H */
+#endif  /* CTAGS_MAIN_NESTLEVEL_H */
 
 /* vi:set tabstop=4 shiftwidth=4: */
diff --git a/ctags/main/options.c b/ctags/main/options.c
@@ -1,22 +1,21 @@
 /*
-*
-*   Copyright (c) 1996-2001, Darren Hiebert
+*   Copyright (c) 1996-2003, Darren Hiebert
 *
 *   This source code is released for free distribution under the terms of the
-*   GNU General Public License.
+*   GNU General Public License version 2 or (at your option) any later version.
 *
 *   This module contains functions to process command line options.
 */
 
 /*
 *   INCLUDE FILES
 */
-#include "general.h"    /* must always come first */
+#include "general.h"  /* must always come first */
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <ctype.h>      /* to declare isspace () */
+#include <ctype.h>  /* to declare isspace () */
 
 #include "ctags.h"
 #include "routines.h"
@@ -28,7 +27,7 @@
 
 #define CTAGS_ENVIRONMENT       "CTAGS"
 
-#define CTAGS_FILE      "tags"
+#define CTAGS_FILE  "tags"
 
 
 /*  The following separators are permitted for list options.
@@ -39,14 +38,14 @@
 #define IGNORE_SEPARATORS   ", \t\n"
 
 #ifndef DEFAULT_FILE_FORMAT
-# define DEFAULT_FILE_FORMAT    2
+# define DEFAULT_FILE_FORMAT  2
 #endif
 
 #if defined (WIN32) || defined (HAVE_OPENDIR)
 # define RECURSE_SUPPORTED
 #endif
 
-#define isCompoundOption(c)     (boolean) (strchr ("fohiILpDb", (c)) != NULL)
+#define isCompoundOption(c)  (boolean) (strchr ("fohiILpDb", (c)) != NULL)
 
 
 

diff --git a/ctags/main/options.h b/ctags/main/options.h
@@ -18,7 +18,7 @@
 /*
 *   INCLUDE FILES
 */
-#include "general.h"    /* must always come first */
+#include "general.h"  /* must always come first */
 
 #include <stdarg.h>
 
@@ -88,7 +88,7 @@ typedef struct sOptionValues {
 /*
 *   GLOBAL VARIABLES
 */
-extern CONST_OPTION optionValues        Option;
+extern CONST_OPTION optionValues		Option;
 
 /*
 *   FUNCTION PROTOTYPES
@@ -106,6 +106,6 @@ extern void freeOptionResources (void);
 
 void addIgnoreListFromFile (const char *const fileName);
 
-#endif  /* _OPTIONS_H */
+#endif  /* CTAGS_MAIN_OPTIONS_H */
 
 /* vi:set tabstop=4 shiftwidth=4: */