refactor: make flags code reusable

flags related code defined in lregex.c and could be used in the file. This patch makes the code usable outside of the file. evalFlags is renamed to flagsEval. Signed-off-by: Masatake YAMATO <yamato@redhat.com>
jakeprobst · Sep 7, 2014 · 0397609 · 0397609
1 parent 9692dbe
commit 0397609
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 63 deletions.
diff --git a/flags.c b/flags.c
@@ -0,0 +1,78 @@
+/*
+*
+*   Copyright (c) 2000-2003, Darren Hiebert
+*
+*   This source code is released for free distribution under the terms of the
+*   GNU General Public License.
+*
+*   This module contains functions to process command line options.
+*/
+
+/*
+*   INCLUDE FILES
+*/
+#include "general.h"  /* must always come first */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "flags.h"
+#include "vstring.h"
+#include "routines.h"
+
+#define LONG_FLAG_OPEN  '{'
+#define LONG_FLAG_CLOSE '}'
+
+void flagsEval (const char* flags, flagDefinition* defs, unsigned int ndefs, void* data)
+{
+	unsigned int i, j;
+
+	if (!flags)
+		return;
+	if (!defs)
+		return;
+
+	for (i = 0 ; flags [i] != '\0' ; ++i)
+	{
+		if (flags [i] == LONG_FLAG_OPEN)
+		{
+			const char* aflag = flags + i + 1;
+			char* needle_close_paren = strchr(aflag, LONG_FLAG_CLOSE);
+			const char* param;
+			char* needle_eqaul;
+
+			if (needle_close_paren == NULL)
+			{
+				error (WARNING, "long flags specifier opened with `%c' is not closed `%c'",
+				       LONG_FLAG_OPEN, LONG_FLAG_CLOSE);
+				break;
+			}
+
+			*needle_close_paren = '\0';
+			needle_eqaul = strchr(aflag, '=');
+			if ((needle_eqaul == NULL || (needle_eqaul >= needle_close_paren)))
+			{
+				needle_eqaul = NULL;
+				param = NULL;
+			}
+			else
+			{
+				param = needle_eqaul + 1;
+				*needle_eqaul = '\0';
+			}
+
+			for ( j = 0 ; j < ndefs ; ++j )
+				if (defs[j].long_str && (strcmp(aflag, defs[j].long_str) == 0))
+					defs[j].long_proc(aflag, param, data);
+
+			if (needle_eqaul)
+				*needle_eqaul = '=';
+			*needle_close_paren = LONG_FLAG_CLOSE;
+
+			i = needle_close_paren - flags;
+		}
+		else for (j = 0 ; j < ndefs ; ++j)
+			if (flags[i] == defs[j].short_char)
+				defs[j].short_proc(flags[i], data);
+	}
+}
diff --git a/flags.h b/flags.h
@@ -0,0 +1,24 @@
+/*
+*
+*
+*   Copyright (c) 2000-2003, Darren Hiebert
+*
+*   This source code is released for free distribution under the terms of the
+*   GNU General Public License.
+*
+*   Defines external interface to option processing.
+*/
+#ifndef _FLAGS_H
+#define _FLAGS_H
+
+typedef struct {
+	char short_char;
+	char *long_str;
+	void (* short_proc) (char c,  void *data);
+	void (* long_proc)  (const char* const s, const char* const param, void *data);
+  /* TODO: handler for help message */
+} flagDefinition;
+
+extern void flagsEval (const char* flags, flagDefinition* defs, unsigned int ndefs, void* data);
+
+#endif	/* _FLAGS_H */
diff --git a/lregex.c b/lregex.c
@@ -31,6 +31,7 @@
 
 #include "debug.h"
 #include "entry.h"
+#include "flags.h"
 #include "parse.h"
 #include "read.h"
 #include "routines.h"
@@ -50,9 +51,6 @@
 
 #define REGEX_NAME "Regex"
 
-#define LONG_FLAG_OPEN  '{'
-#define LONG_FLAG_CLOSE '}'
-
 /*
 *   DATA DECLARATIONS
 */
@@ -89,12 +87,6 @@ typedef struct {
 	unsigned int count;
 } patternSet;
 
-typedef struct {
-	char short_char;
-	char *long_str;
-	void (* short_proc) (char c,  void *data);
-	void (* long_proc)  (const char* const s, const char* const param, void *data);
-} flagDefinition;
 #define COUNT(D) (sizeof(D)/sizeof(D[0]))
 
 /*
@@ -111,59 +103,6 @@ static int SetUpper = -1;  /* upper language index in list */
 *   FUNCTION DEFINITIONS
 */
 
-static void evalFlags (const char* flags, flagDefinition* defs, unsigned int ndefs, void* data)
-{
-	unsigned int i, j;
-
-	if (!flags)
-		return;
-	if (!defs)
-		return;
-
-	for (i = 0 ; flags [i] != '\0' ; ++i)
-	{
-		if (flags [i] == LONG_FLAG_OPEN)
-		{
-			const char* aflag = flags + i + 1;
-			char* needle_close_paren = strchr(aflag, LONG_FLAG_CLOSE);
-			const char* param;
-			char* needle_eqaul;
-
-			if (needle_close_paren == NULL)
-			{
-				error (WARNING, "long flags specifier opened with `%c' is not closed `%c'",
-				       LONG_FLAG_OPEN, LONG_FLAG_CLOSE);
-				break;
-			}
-
-			*needle_close_paren = '\0';
-			needle_eqaul = strchr(aflag, '=');
-			if ((needle_eqaul == NULL || (needle_eqaul >= needle_close_paren)))
-			{
-				needle_eqaul = NULL;
-				param = NULL;
-			}
-			else
-			{
-				param = needle_eqaul + 1;
-				*needle_eqaul = '\0';
-			}
-
-			for ( j = 0 ; j < ndefs ; ++j )
-				if (defs[j].long_str && (strcmp(aflag, defs[j].long_str) == 0))
-					defs[j].long_proc(aflag, param, data);
-
-			if (needle_eqaul)
-				*needle_eqaul = '=';
-			*needle_close_paren = LONG_FLAG_CLOSE;
-
-			i = needle_close_paren - flags;
-		}
-		else for (j = 0 ; j < ndefs ; ++j)
-			if (flags[i] == defs[j].short_char)
-				defs[j].short_proc(flags[i], data);
-	}
-}
 
 static void clearPatternSet (const langType language)
 {

diff --git a/source.mak b/source.mak
@@ -3,7 +3,7 @@
 # Shared macros
 
 HEADERS = \
-	args.h ctags.h debug.h entry.h general.h get.h keyword.h \
+	args.h ctags.h debug.h entry.h flags.h general.h get.h keyword.h \
 	main.h options.h parse.h parsers.h read.h routines.h sort.h \
 	strlist.h trash.h vstring.h
 
@@ -24,6 +24,7 @@ SOURCES = \
 	entry.c \
 	erlang.c \
 	falcon.c \
+	flags.c \
 	flex.c \
 	fortran.c \
 	get.c \
@@ -93,6 +94,7 @@ OBJECTS = \
 	entry.$(OBJEXT) \
 	erlang.$(OBJEXT) \
 	falcon.$(OBJEXT) \
+	flags.$(OBJEXT) \
 	flex.$(OBJEXT) \
 	fortran.$(OBJEXT) \
 	get.$(OBJEXT) \