refactor: remove extern "C" from job code callbacks

bareos · Aug 5, 2023 · 5ec88ca · 5ec88ca
1 parent 8dc1d2e
commit 5ec88ca
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/core/src/dird/dird_conf.cc b/core/src/dird/dird_conf.cc
@@ -3083,7 +3083,7 @@ static void StoreRunscript(LEX* lc, ResourceItem* item, int index, int pass)
  * %m = Prev Backup JobId
  * %M = New Backup JobId
  */
-extern "C" std::optional<std::string> job_code_callback_director(JobControlRecord* jcr,
+std::optional<std::string> job_code_callback_director(JobControlRecord* jcr,
                                             const char* param)
 {
   static const std::string yes = "yes";

diff --git a/core/src/dird/dird_conf.h b/core/src/dird/dird_conf.h
@@ -679,7 +679,7 @@ bool print_datatype_schema_json(PoolMem& buffer,
 json_t* json_datatype(const int type, ResourceItem items[]);
 const char* AuthenticationProtocolTypeToString(uint32_t auth_protocol);
 const char* JobLevelToString(int level);
-extern "C" std::optional<std::string> job_code_callback_director(JobControlRecord* jcr, const char*);
+std::optional<std::string> job_code_callback_director(JobControlRecord* jcr, const char*);
 const char* GetUsageStringForConsoleConfigureCommand();
 void DestroyConfigureUsageString();
 bool PopulateDefs();

diff --git a/core/src/filed/dir_cmd.cc b/core/src/filed/dir_cmd.cc
@@ -94,8 +94,6 @@ static alist<pthread_t*>* client_initiated_connection_threads = nullptr;
 extern bool AccurateCmd(JobControlRecord* jcr);
 extern bool StatusCmd(JobControlRecord* jcr);
 extern bool QstatusCmd(JobControlRecord* jcr);
-extern "C" std::optional<std::string> job_code_callback_filed(JobControlRecord* jcr,
-                                         const char* param);
 
 /* Forward referenced functions */
 static bool BackupCmd(JobControlRecord* jcr);

diff --git a/core/src/filed/fileset.cc b/core/src/filed/fileset.cc
@@ -54,7 +54,7 @@ namespace filedaemon {
  * %D = Director
  * %m = Modification time (for incremental and differential)
  */
-extern "C" std::optional<std::string> job_code_callback_filed(JobControlRecord* jcr,
+std::optional<std::string> job_code_callback_filed(JobControlRecord* jcr,
                                          const char* param)
 {
   switch (param[0]) {

diff --git a/core/src/filed/fileset.h b/core/src/filed/fileset.h
@@ -38,6 +38,8 @@ int AddWildToFileset(JobControlRecord* jcr, const char* item, int type);
 int AddOptionsFlagsToFileset(JobControlRecord* jcr, const char* item);
 void AddFileset(JobControlRecord* jcr, const char* item);
 bool TermFileset(JobControlRecord* jcr);
+std::optional<std::string> job_code_callback_filed(JobControlRecord* jcr,
+                                         const char*);
 
 } /* namespace filedaemon */
 

diff --git a/core/src/lib/message.h b/core/src/lib/message.h
@@ -42,9 +42,7 @@
 
 class JobControlRecord;
 
-extern "C" {
 typedef std::optional<std::string> (*job_code_callback_t)(JobControlRecord*, const char*);
-}
 
 void Jmsg(JobControlRecord* jcr, int type, utime_t mtime, const char* fmt, ...);
 void Qmsg(JobControlRecord* jcr, int type, utime_t mtime, const char* fmt, ...);