readtags,refactor: move "canon" local variable in main function to inputSpec

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

extra-cmds/readtags-cmd.c

@@ -55,6 +55,8 @@ struct actionSpec {
 		ACTION_LIST_PTAGS = 1 << 2,
 	} action;
 	const char *name;			/* for ACTION_FIND */
+	bool canonicalizing;
+	struct canonWorkArea canon;
 };
 
 static const char *ProgramName;
@@ -719,24 +721,17 @@ extern int main (int argc, char **argv)
 	struct actionSpec actionSpec = {
 		.action  = ACTION_NONE,
 		.name = NULL,
+		.canonicalizing = false,
+		.canon = {
+			.cacheTable = NULL,
+			.ptags = false,
+			/* .absoluteOnly = false, */
+		},
 	};
 
 	memset (&printOpts, 0, sizeof (printOpts));
 	memset (&readOpts, 0, sizeof (readOpts));
 
-	struct canonWorkArea canonWorkArea = {
-		.cacheTable = NULL,
-		.ptags = false,
-		.absoluteOnly = false,
-	};
-	struct canonWorkArea canonWorkAreaAbsForm = {
-		.cacheTable = NULL,
-		.ptags = false,
-		.absoluteOnly = true,
-	};
-	struct canonWorkArea *canon = NULL;
-
-
 	ProgramName = argv [0];
 	setExecutableName (ProgramName);
 	if (argc == 1)
@@ -839,9 +834,15 @@ extern int main (int argc, char **argv)
 				}
 			}
 			else if (strcmp (optname, "absolute-input") == 0)
-				canon = &canonWorkAreaAbsForm;
+			{
+				actionSpec.canonicalizing = true;
+				actionSpec.canon.absoluteOnly = true;
+			}
 			else if (strcmp (optname, "canonicalize-input") == 0)
-				canon = &canonWorkArea;
+			{
+				actionSpec.canonicalizing = true;
+				actionSpec.canon.absoluteOnly = false;
+			}
 #ifdef READTAGS_DSL
 			else if (strcmp (optname, "filter") == 0)
 			{
@@ -952,10 +953,12 @@ extern int main (int argc, char **argv)
 							printUsage(stderr, 1);
 						break;
 					case 'A':
-						canon = &canonWorkAreaAbsForm;
+						actionSpec.canonicalizing = true;
+						actionSpec.canon.absoluteOnly = true;
 						break;
 					case 'C':
-						canon = &canonWorkArea;
+						actionSpec.canonicalizing = true;
+						actionSpec.canon.absoluteOnly = false;
 						break;
 #ifdef READTAGS_DSL
 					case 'Q':
@@ -1009,18 +1012,20 @@ extern int main (int argc, char **argv)
 
 	if (actionSpec.action & ACTION_LIST_PTAGS)
 	{
-		if (canon)
-			canon->ptags = true;
-		listTags (&inputSpec, 1, &printOpts, canon);
-		if (canon)
-			canon->ptags = false;
+		if (actionSpec.canonicalizing)
+			actionSpec.canon.ptags = true;
+		listTags (&inputSpec, 1, &printOpts,
+				  actionSpec.canonicalizing? &actionSpec.canon: NULL);
+		if (actionSpec.canonicalizing)
+			actionSpec.canon.ptags = false;
 	}
 
 	if (actionSpec.action & ACTION_FIND)
-		findTag (&inputSpec, actionSpec.name, &readOpts, &printOpts, canon);
+		findTag (&inputSpec, actionSpec.name, &readOpts, &printOpts,
+				 actionSpec.canonicalizing? &actionSpec.canon: NULL);
 	else if (actionSpec.action & ACTION_LIST)
-		listTags (&inputSpec, 0, &printOpts, canon);
-
+		listTags (&inputSpec, 0, &printOpts,
+				  actionSpec.canonicalizing? &actionSpec.canon: NULL);
 
 #ifdef READTAGS_DSL
 	if (Qualifier)
@@ -1031,11 +1036,8 @@ extern int main (int argc, char **argv)
 		f_destroy (Formatter);
 #endif
 
-	if (canon)
-	{
-		if (canon->cacheTable)
-			canonFnameCacheTableDelete (canon->cacheTable);
-	}
+	if (actionSpec.canon.cacheTable)
+			canonFnameCacheTableDelete (actionSpec.canon.cacheTable);
 
 	if (inputSpec.tempFileName)
 	{