readtags,refactor: pass the actionSpec to action functions instead of the canonWorkArea

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

Author: masatake

extra-cmds/readtags-cmd.c

@@ -229,7 +229,7 @@ static int compareTagEntry (const void *a, const void *b)
 static void walkTags (tagFile *const file, tagEntry *first_entry,
 					  tagResult (* nextfn) (tagFile *const, tagEntry *),
 					  void (* actionfn) (const tagEntry *, void *), void *data,
-					  struct canonWorkArea *canon)
+					  struct actionSpec *actionSpec)
 {
 	struct tagEntryArray *a = NULL;
 
@@ -240,13 +240,13 @@ static void walkTags (tagFile *const file, tagEntry *first_entry,
 	{
 		tagEntry *shadow = first_entry;
 		tagEntry  shadowRec;
-		if (canon
-			&& (canon->ptags == false
+		if (actionSpec->canonicalizing
+			&& (actionSpec->canon.ptags == false
 				|| strcmp (first_entry->name, "!_TAG_PROC_CWD") == 0))
 		{
 			shadowRec = *first_entry;
 			shadow = &shadowRec;
-			shadow->file = canonicalizeFileName (canon->cacheTable,
+			shadow->file = canonicalizeFileName (actionSpec->canon.cacheTable,
 												 first_entry->file);
 		}
 
@@ -292,19 +292,19 @@ static void walkTags (tagFile *const file, tagEntry *first_entry,
 static void walkTags (tagFile *const file, tagEntry *first_entry,
 					  tagResult (* nextfn) (tagFile *const, tagEntry *),
 					  void (* actionfn) (const tagEntry *, void *), void *data,
-					  struct canonWorkArea *canon)
+					  struct actionSpec *actionSpec)
 {
 	do
 	{
 		tagEntry *shadow = first_entry;
 		tagEntry  shadowRec;
-		if (canon
-			&& (canon->ptags == false
+		if (actionSpec->canonicalizing
+			&& (actionSpec->canon.ptags == false
 				|| strcmp (first_entry->name, "!_TAG_PROC_CWD") == 0))
 		{
 			shadow = &shadowRec;
 			shadowRec = *first_entry;
-			shadow->file = canonicalizeFileName (canon->cacheTable,
+			shadow->file = canonicalizeFileName (actionSpec->canon.cacheTable,
 												 first_entry->file);
 		}
 
@@ -472,7 +472,7 @@ static int hasPsuedoTag (tagFile *const file,
 
 static void findTag (struct inputSpec *inputSpec,
 					 const char *const name, readOptions *readOpts,
-					 tagPrintOptions *printOpts, struct canonWorkArea *canon)
+					 tagPrintOptions *printOpts, struct actionSpec *actionSpec)
 {
 	tagEntry entry;
 	int err = 0;
@@ -486,8 +486,8 @@ static void findTag (struct inputSpec *inputSpec,
 		exit (1);
 	}
 
-	if (canon && canon->cacheTable == NULL)
-		canon->cacheTable = makeCanonFnameCacheTable (fileX, canon->absoluteOnly);
+	if (actionSpec->canonicalizing && actionSpec->canon.cacheTable == NULL)
+		actionSpec->canon.cacheTable = makeCanonFnameCacheTable (fileX, actionSpec->canon.absoluteOnly);
 
 	if (printOpts->escaping)
 	{
@@ -518,7 +518,7 @@ static void findTag (struct inputSpec *inputSpec,
 				  Formatter? printTagWithFormatter:
 #endif
 				  printTag, printOpts,
-				  canon);
+				  actionSpec);
 	else if ((err = tagsGetErrno (fileX->tagFile)) != 0)
 	{
 		fprintf (stderr, "%s: error in tagsFind(): %s\n",
@@ -530,7 +530,7 @@ static void findTag (struct inputSpec *inputSpec,
 }
 
 static void listTags (struct inputSpec* inputSpec, int pseudoTags, tagPrintOptions *printOpts,
-					  struct canonWorkArea *canon)
+					  struct actionSpec *actionSpec)
 {
 	tagEntry entry;
 	int err = 0;
@@ -545,8 +545,9 @@ static void listTags (struct inputSpec* inputSpec, int pseudoTags, tagPrintOptio
 		exit (1);
 	}
 
-	if (canon && canon->cacheTable == NULL)
-		canon->cacheTable = makeCanonFnameCacheTable (fileX, canon->absoluteOnly);
+	if (actionSpec->canonicalizing && actionSpec->canon.cacheTable == NULL)
+		actionSpec->canon.cacheTable = makeCanonFnameCacheTable (fileX,
+																 actionSpec->canon.absoluteOnly);
 
 	if (printOpts->escaping)
 	{
@@ -560,7 +561,7 @@ static void listTags (struct inputSpec* inputSpec, int pseudoTags, tagPrintOptio
 	{
 		if (tagsFirstPseudoTag (fileX->tagFile, &entry) == TagSuccess)
 			walkTags (fileX->tagFile, &entry, tagsNextPseudoTag, printPseudoTag, printOpts,
-					  canon);
+					  actionSpec);
 		else if ((err = tagsGetErrno (fileX->tagFile)) != 0)
 		{
 			fprintf (stderr, "%s: error in tagsFirstPseudoTag(): %s\n",
@@ -577,7 +578,7 @@ static void listTags (struct inputSpec* inputSpec, int pseudoTags, tagPrintOptio
 					  Formatter? printTagWithFormatter:
 #endif
 					  printTag, printOpts,
-					  canon);
+					  actionSpec);
 		else if ((err = tagsGetErrno (fileX->tagFile)) != 0)
 		{
 			fprintf (stderr, "%s: error in tagsFirst(): %s\n",
@@ -1164,18 +1165,15 @@ extern int main (int argc, char **argv)
 		{
 			if (actionSpec.canonicalizing)
 				actionSpec.canon.ptags = true;
-			listTags (inputSpec, 1, &printOpts,
-					  actionSpec.canonicalizing? &actionSpec.canon: NULL);
+			listTags (inputSpec, 1, &printOpts, &actionSpec);
 			if (actionSpec.canonicalizing)
 				actionSpec.canon.ptags = false;
 		}
 
 		if (actionSpec.action & ACTION_FIND)
-			findTag (inputSpec, actionSpec.name, &readOpts, &printOpts,
-					 actionSpec.canonicalizing? &actionSpec.canon: NULL);
+			findTag (inputSpec, actionSpec.name, &readOpts, &printOpts, &actionSpec);
 		else if (actionSpec.action & ACTION_LIST)
-			listTags (inputSpec, 0, &printOpts,
-					  actionSpec.canonicalizing? &actionSpec.canon: NULL);
+			listTags (inputSpec, 0, &printOpts, &actionSpec);
 
 		if (actionSpec.canon.cacheTable)
 		{