main: introduce default trash box that can be used commonly in ctags

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
glibg10b · Apr 24, 2017 · a09da8e · a09da8e
1 parent b1466ae
commit a09da8e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/main/main.c b/main/main.c
@@ -75,6 +75,7 @@
 #include "read.h"
 #include "routines.h"
 #include "trace.h"
+#include "trashbox.h"
 #include "writer.h"
 
 #ifdef HAVE_JANSSON
@@ -628,6 +629,8 @@ extern int main (int argc CTAGS_ATTR_UNUSED, char **argv)
 {
 	cookedArgs *args;
 
+	initDefaultTrashBox ();
+
 	DEBUG_INIT();
 
 	setErrorPrinter (stderrDefaultErrorPrinter, NULL);
@@ -668,6 +671,8 @@ extern int main (int argc CTAGS_ATTR_UNUSED, char **argv)
 	freeEncodingResources ();
 #endif
 
+	finiDefaultTrashBox();
+
 	if (Option.printLanguage)
 		return (Option.printLanguage == true)? 0: 1;
 

diff --git a/main/trashbox.c b/main/trashbox.c
@@ -25,6 +25,8 @@ struct sTrashBox {
 	Trash *trash;
 };
 
+static TrashBox* defaultTrashBox;
+
 static Trash* trashPut (Trash* trash, void* item,
 			TrashDestroyItemProc destrctor);
 static Trash* trashTakeBack (Trash* trash, void* item, TrashDestroyItemProc* destrctor);
@@ -41,20 +43,29 @@ extern TrashBox* trashBoxStack     (TrashBox* trash_box)
 {
 	TrashBox *t = trashBoxNew();
 
+	if (!trash_box)
+		trash_box = defaultTrashBox;
+
 	trashBoxPut (trash_box, t, (TrashBoxDestroyItemProc) trashBoxDelete);
 
 	return t;
 }
 
 extern void trashBoxDelete (TrashBox* trash_box)
 {
+	if (!trash_box)
+		trash_box = defaultTrashBox;
+
 	trashBoxMakeEmpty(trash_box);
 
 	eFree (trash_box);
 }
 
 extern void*  trashBoxPut (TrashBox* trash_box, void* item, TrashBoxDestroyItemProc destroy)
 {
+	if (!trash_box)
+		trash_box = defaultTrashBox;
+
 	trash_box->trash = trashPut(trash_box->trash, item, destroy);
 	return item;
 }
@@ -63,20 +74,29 @@ extern TrashBoxDestroyItemProc trashBoxTakeBack (TrashBox* trash_box, void* item
 {
 	TrashBoxDestroyItemProc d;
 
+	if (!trash_box)
+		trash_box = defaultTrashBox;
+
 	trash_box->trash = trashTakeBack(trash_box->trash, item, &d);
 	return d;
 }
 
 extern void   trashBoxMakeEmpty (TrashBox* trash_box)
 {
-  trash_box->trash = trashMakeEmpty (trash_box->trash);
+	if (!trash_box)
+		trash_box = defaultTrashBox;
+
+	trash_box->trash = trashMakeEmpty (trash_box->trash);
 }
 
 
 extern void      trashBoxFree      (TrashBox* trash_box, void* item)
 {
 	TrashBoxDestroyItemProc d;
 
+	if (!trash_box)
+		trash_box = defaultTrashBox;
+
 	d = trashBoxTakeBack (trash_box, item);
 	d (item);
 }
@@ -145,6 +165,17 @@ static Trash* trashMakeEmpty (Trash* trash)
 	return NULL;
 }
 
+extern void initDefaultTrashBox (void)
+{
+	defaultTrashBox = trashBoxNew ();
+}
+
+extern void finiDefaultTrashBox (void)
+{
+	trashBoxDelete (defaultTrashBox);
+	defaultTrashBox = NULL;
+}
+
 #ifdef TRASH_TEST
 #include <stdio.h>
 

diff --git a/main/trashbox.h b/main/trashbox.h
@@ -24,4 +24,8 @@ extern TrashBoxDestroyItemProc trashBoxTakeBack  (TrashBox* trash_box, void* ite
 extern void      trashBoxFree      (TrashBox* trash_box, void* item);
 extern void      trashBoxMakeEmpty (TrashBox* trash_box);
 
+#define TRASH_BOX(PTR,PROC) trashBoxPut(NULL, PTR,PROC)
+extern void initDefaultTrashBox (void);
+extern void finiDefaultTrashBox  (void);
+
 #endif /* CTAGS_MAIN_TRASH_H */