Tweak plugin entry points layout.

bareos · Feb 17, 2015 · bb908b8 · bb908b8
1 parent c55c22e
commit bb908b8
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 21 deletions.
diff --git a/src/plugins/dird/example-plugin-dir.c b/src/plugins/dird/example-plugin-dir.c
@@ -79,7 +79,10 @@ extern "C" {
  *
  * External entry point called by Bareos to "load" the plugin
  */
-bRC loadPlugin(bDirInfo *lbinfo, bDirFuncs *lbfuncs, genpInfo **pinfo, pDirFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bDirInfo *lbinfo,
+                           bDirFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           pDirFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                  /* set Bareos funct pointers */
    binfo  = lbinfo;
@@ -94,7 +97,7 @@ bRC loadPlugin(bDirInfo *lbinfo, bDirFuncs *lbfuncs, genpInfo **pinfo, pDirFuncs
 /*
  * External entry point to unload the plugin
  */
-bRC unloadPlugin()
+bRC DLL_IMP_EXP unloadPlugin()
 {
    printf("plugin: Unloaded\n");
    return bRC_OK;

diff --git a/src/plugins/dird/python-dir.c b/src/plugins/dird/python-dir.c
@@ -102,7 +102,10 @@ extern "C" {
  *
  * External entry point called by Bareos to "load" the plugin
  */
-bRC loadPlugin(bDirInfo *lbinfo, bDirFuncs *lbfuncs, genpInfo **pinfo, pDirFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bDirInfo *lbinfo,
+                           bDirFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           pDirFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                  /* Set Bareos funct pointers */
    binfo  = lbinfo;
@@ -125,7 +128,7 @@ bRC loadPlugin(bDirInfo *lbinfo, bDirFuncs *lbfuncs, genpInfo **pinfo, pDirFuncs
 /*
  * External entry point to unload the plugin
  */
-bRC unloadPlugin()
+bRC DLL_IMP_EXP unloadPlugin()
 {
 #ifdef HAVE_PYTHON
    /*

diff --git a/src/plugins/filed/bpipe-fd.c b/src/plugins/filed/bpipe-fd.c
@@ -117,7 +117,10 @@ extern "C" {
 /*
  * External entry point called by Bareos to "load" the plugin
  */
-bRC DLL_IMP_EXP loadPlugin(bInfo *lbinfo, bFuncs *lbfuncs, genpInfo **pinfo, pFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bInfo *lbinfo,
+                           bFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           pFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                  /* set Bareos funct pointers */
    binfo  = lbinfo;

diff --git a/src/plugins/filed/example-plugin-fd.c b/src/plugins/filed/example-plugin-fd.c
@@ -80,8 +80,10 @@ extern "C" {
 /*
  * Plugin called here when it is first loaded
  */
-bRC DLL_IMP_EXP
-loadPlugin(bInfo *lbinfo, bFuncs *lbfuncs, genpInfo **pinfo, pFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bInfo *lbinfo,
+                           bFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           pFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                  /* set Bareos funct pointers */
    binfo  = lbinfo;

diff --git a/src/plugins/filed/python-fd.c b/src/plugins/filed/python-fd.c
@@ -116,8 +116,10 @@ extern "C" {
 /*
  * Plugin called here when it is first loaded
  */
-bRC DLL_IMP_EXP
-loadPlugin(bInfo *lbinfo, bFuncs *lbfuncs, genpInfo **pinfo, pFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bInfo *lbinfo,
+                           bFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           pFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                  /* Set Bareos funct pointers */
    binfo  = lbinfo;

diff --git a/src/plugins/filed/test-deltaseq-fd.c b/src/plugins/filed/test-deltaseq-fd.c
@@ -127,7 +127,10 @@ extern "C" {
 /*
  * External entry point called by Bareos to "load" the plugin
  */
-bRC loadPlugin(bInfo *lbinfo, bFuncs *lbfuncs, genpInfo **pinfo, pFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bInfo *lbinfo,
+                           bFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           pFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                  /* set Bareos funct pointers */
    binfo  = lbinfo;
@@ -145,7 +148,7 @@ bRC loadPlugin(bInfo *lbinfo, bFuncs *lbfuncs, genpInfo **pinfo, pFuncs **pfuncs
 /*
  * External entry point to unload the plugin
  */
-bRC unloadPlugin()
+bRC DLL_IMP_EXP unloadPlugin()
 {
 // Dmsg(NULL, dbglvl, "delta-test-fd: Unloaded\n");
    return bRC_OK;

diff --git a/src/plugins/filed/test-plugin-fd.c b/src/plugins/filed/test-plugin-fd.c
@@ -131,7 +131,10 @@ extern "C" {
 /*
  * External entry point called by Bareos to "load" the plugin
  */
-bRC loadPlugin(bInfo *lbinfo, bFuncs *lbfuncs, genpInfo **pinfo, pFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bInfo *lbinfo,
+                           bFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           pFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                  /* set Bareos funct pointers */
    binfo  = lbinfo;
@@ -144,7 +147,7 @@ bRC loadPlugin(bInfo *lbinfo, bFuncs *lbfuncs, genpInfo **pinfo, pFuncs **pfuncs
 /*
  * External entry point to unload the plugin
  */
-bRC unloadPlugin()
+bRC DLL_IMP_EXP unloadPlugin()
 {
    return bRC_OK;
 }

diff --git a/src/plugins/stored/example-plugin-sd.c b/src/plugins/stored/example-plugin-sd.c
@@ -79,8 +79,10 @@ extern "C" {
  *
  * External entry point called by Bareos to "load" the plugin
  */
-bRC DLL_IMP_EXP
-loadPlugin(bsdInfo *lbinfo, bsdFuncs *lbfuncs, genpInfo **pinfo, psdFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bsdInfo *lbinfo,
+                           bsdFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           psdFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                /* set Bareos funct pointers */
    binfo  = lbinfo;
@@ -94,8 +96,7 @@ loadPlugin(bsdInfo *lbinfo, bsdFuncs *lbfuncs, genpInfo **pinfo, psdFuncs **pfun
 /*
  * External entry point to unload the plugin
  */
-bRC DLL_IMP_EXP
-unloadPlugin()
+bRC DLL_IMP_EXP unloadPlugin()
 {
    printf("example-plugin-sd: Unloaded\n");
    return bRC_OK;

diff --git a/src/plugins/stored/python-sd.c b/src/plugins/stored/python-sd.c
@@ -103,8 +103,10 @@ extern "C" {
  *
  * External entry point called by Bareos to "load" the plugin
  */
-bRC DLL_IMP_EXP
-loadPlugin(bsdInfo *lbinfo, bsdFuncs *lbfuncs, genpInfo **pinfo, psdFuncs **pfuncs)
+bRC DLL_IMP_EXP loadPlugin(bsdInfo *lbinfo,
+                           bsdFuncs *lbfuncs,
+                           genpInfo **pinfo,
+                           psdFuncs **pfuncs)
 {
    bfuncs = lbfuncs;                /* Set Bareos funct pointers */
    binfo  = lbinfo;
@@ -127,8 +129,7 @@ loadPlugin(bsdInfo *lbinfo, bsdFuncs *lbfuncs, genpInfo **pinfo, psdFuncs **pfun
 /*
  * External entry point to unload the plugin
  */
-bRC DLL_IMP_EXP
-unloadPlugin()
+bRC DLL_IMP_EXP unloadPlugin()
 {
 #ifdef HAVE_PYTHON
    /*