From 86450c40aa1fbe8fe2d7a5116e7234b73ce18b92 Mon Sep 17 00:00:00 2001
From: Alaa Eddine Elamri <alaeddine.elamri@bareos.com>
Date: Fri, 23 Dec 2022 15:21:56 +0100
Subject: [PATCH] refactor: change return value of `TermFindFiles`

It turns out that `TermFindFiles` and  `TermFindOne` were made
to return hard links just for testfind. Nowhere else in the code is
hard links count used.
Testfind will later directly get the count from its own fileset without
the need for calling `TermFindFiles`
---
 core/src/findlib/find.cc     |  8 ++------
 core/src/findlib/find.h      |  2 +-
 core/src/findlib/find_one.cc | 12 +++---------
 core/src/findlib/find_one.h  |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/core/src/findlib/find.cc b/core/src/findlib/find.cc
index e257a57fefd..23223aea0bc 100644
--- a/core/src/findlib/find.cc
+++ b/core/src/findlib/find.cc
@@ -445,20 +445,16 @@ static int OurCallback(JobControlRecord* jcr,
 }
 
 // Terminate FindFiles() and release all allocated memory
-int TermFindFiles(FindFilesPacket* ff)
+void TermFindFiles(FindFilesPacket* ff)
 {
-  int hard_links = 0;
-
   if (ff) {
     FreePoolMemory(ff->sys_fname);
     if (ff->fname_save) { FreePoolMemory(ff->fname_save); }
     if (ff->link_save) { FreePoolMemory(ff->link_save); }
     if (ff->ignoredir_fname) { FreePoolMemory(ff->ignoredir_fname); }
-    hard_links = TermFindOne(ff);
+    TermFindOne(ff);
     free(ff);
   }
-
-  return hard_links;
 }
 
 // Allocate a new include/exclude block.
diff --git a/core/src/findlib/find.h b/core/src/findlib/find.h
index f47e76ad965..98a921b3393 100644
--- a/core/src/findlib/find.h
+++ b/core/src/findlib/find.h
@@ -280,7 +280,7 @@ int FindFiles(JobControlRecord* jcr,
 bool MatchFiles(JobControlRecord* jcr,
                 FindFilesPacket* ff,
                 int sub(JobControlRecord*, FindFilesPacket* ff_pkt, bool));
-int TermFindFiles(FindFilesPacket* ff);
+void TermFindFiles(FindFilesPacket* ff);
 bool IsInFileset(FindFilesPacket* ff);
 bool AcceptFile(FindFilesPacket* ff);
 findIncludeExcludeItem* allocate_new_incexe(void);
diff --git a/core/src/findlib/find_one.cc b/core/src/findlib/find_one.cc
index 02a94fc1e40..96550a7dd83 100644
--- a/core/src/findlib/find_one.cc
+++ b/core/src/findlib/find_one.cc
@@ -1033,15 +1033,9 @@ int FindOneFile(JobControlRecord* jcr,
   }
 }
 
-int TermFindOne(FindFilesPacket* ff)
+void TermFindOne(FindFilesPacket* ff)
 {
-  int count;
-
-  if (ff->linkhash == NULL) { return 0; }
-
-  count = ff->linkhash->size();
+  if (ff->linkhash == nullptr) { return; }
   delete ff->linkhash;
-  ff->linkhash = NULL;
-
-  return count;
+  ff->linkhash = nullptr;
 }
diff --git a/core/src/findlib/find_one.h b/core/src/findlib/find_one.h
index 07e281ff808..e9848058227 100644
--- a/core/src/findlib/find_one.h
+++ b/core/src/findlib/find_one.h
@@ -29,7 +29,7 @@ int FindOneFile(JobControlRecord* jcr,
                 char* p,
                 dev_t parent_device,
                 bool top_level);
-int TermFindOne(FindFilesPacket* ff);
+void TermFindOne(FindFilesPacket* ff);
 bool HasFileChanged(JobControlRecord* jcr, FindFilesPacket* ff_pkt);
 bool CheckChanges(JobControlRecord* jcr, FindFilesPacket* ff_pkt);