From 052f2f3b973445aafd4240f550f0c5d3fa62bb1c Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 8 Mar 2008 15:18:47 +0000 Subject: [PATCH] Rename fd/dir plugin to use Bacula standard underscore. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6559 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/Makefile.in | 4 ++-- bacula/src/dird/{dir-plugins.c => dir_plugins.c} | 0 bacula/src/dird/{dir-plugins.h => dir_plugins.h} | 0 bacula/src/dird/dird.h | 2 +- bacula/src/filed/Makefile.in | 4 ++-- bacula/src/filed/{fd-plugins.c => fd_plugins.c} | 0 bacula/src/filed/{fd-plugins.h => fd_plugins.h} | 0 bacula/src/filed/filed.h | 2 +- bacula/src/findlib/find.h | 2 +- bacula/src/plugins/dir/Makefile | 10 +++++----- bacula/src/plugins/dir/example-plugin-dir.c | 2 +- bacula/src/plugins/fd/Makefile | 12 ++++++------ bacula/src/plugins/fd/bpipe-fd.c | 2 +- bacula/src/plugins/fd/example-plugin-fd.c | 2 +- bacula/technotes-2.3 | 1 + 15 files changed, 22 insertions(+), 21 deletions(-) rename bacula/src/dird/{dir-plugins.c => dir_plugins.c} (100%) rename bacula/src/dird/{dir-plugins.h => dir_plugins.h} (100%) rename bacula/src/filed/{fd-plugins.c => fd_plugins.c} (100%) rename bacula/src/filed/{fd-plugins.h => fd_plugins.h} (100%) diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in index e3e68e76fc..d202384b28 100644 --- a/bacula/src/dird/Makefile.in +++ b/bacula/src/dird/Makefile.in @@ -29,7 +29,7 @@ dummy: # SVRSRCS = dird.c admin.c authenticate.c \ autoprune.c backup.c bsr.c \ - catreq.c dir-plugins.c dird_conf.c expand.c \ + catreq.c dir_plugins.c dird_conf.c expand.c \ fd_cmds.c getmsg.c inc_conf.c job.c \ jobq.c migrate.c \ mountreq.c msgchan.c next_vol.c newvol.c \ @@ -44,7 +44,7 @@ SVRSRCS = dird.c admin.c authenticate.c \ ua_status.c ua_tree.c ua_update.c verify.c SVROBJS = dird.o admin.o authenticate.o \ autoprune.o backup.o bsr.o \ - catreq.o dir-plugins.o dird_conf.o expand.o \ + catreq.o dir_plugins.o dird_conf.o expand.o \ fd_cmds.o getmsg.o inc_conf.o job.o \ jobq.o migrate.o \ mountreq.o msgchan.o next_vol.o newvol.o \ diff --git a/bacula/src/dird/dir-plugins.c b/bacula/src/dird/dir_plugins.c similarity index 100% rename from bacula/src/dird/dir-plugins.c rename to bacula/src/dird/dir_plugins.c diff --git a/bacula/src/dird/dir-plugins.h b/bacula/src/dird/dir_plugins.h similarity index 100% rename from bacula/src/dird/dir-plugins.h rename to bacula/src/dird/dir_plugins.h diff --git a/bacula/src/dird/dird.h b/bacula/src/dird/dird.h index f4c603fb74..594e6bd5de 100644 --- a/bacula/src/dird/dird.h +++ b/bacula/src/dird/dird.h @@ -36,7 +36,7 @@ #include "lib/runscript.h" #include "lib/breg.h" #include "dird_conf.h" -#include "dir-plugins.h" +#include "dir_plugins.h" #define DIRECTOR_DAEMON 1 diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in index 8009ff619d..5ee629842b 100644 --- a/bacula/src/filed/Makefile.in +++ b/bacula/src/filed/Makefile.in @@ -29,11 +29,11 @@ dummy: # SVRSRCS = filed.c authenticate.c acl.c backup.c estimate.c \ - fd-plugins.c \ + fd_plugins.c \ filed_conf.c heartbeat.c job.c pythonfd.c \ restore.c status.c verify.c verify_vol.c SVROBJS = filed.o authenticate.o acl.o backup.o estimate.o \ - fd-plugins.o \ + fd_plugins.o \ filed_conf.o heartbeat.o job.o pythonfd.o \ restore.o status.o verify.o verify_vol.o diff --git a/bacula/src/filed/fd-plugins.c b/bacula/src/filed/fd_plugins.c similarity index 100% rename from bacula/src/filed/fd-plugins.c rename to bacula/src/filed/fd_plugins.c diff --git a/bacula/src/filed/fd-plugins.h b/bacula/src/filed/fd_plugins.h similarity index 100% rename from bacula/src/filed/fd-plugins.h rename to bacula/src/filed/fd_plugins.h diff --git a/bacula/src/filed/filed.h b/bacula/src/filed/filed.h index 5212530265..ec1aa07bb6 100644 --- a/bacula/src/filed/filed.h +++ b/bacula/src/filed/filed.h @@ -36,7 +36,7 @@ #define FILE_DAEMON 1 #include "filed_conf.h" -#include "fd-plugins.h" +#include "fd_plugins.h" #include "findlib/find.h" #include "jcr.h" #include "acl.h" diff --git a/bacula/src/findlib/find.h b/bacula/src/findlib/find.h index cbbbe6c63c..040458d5d2 100644 --- a/bacula/src/findlib/find.h +++ b/bacula/src/findlib/find.h @@ -36,7 +36,7 @@ #include "jcr.h" #include "bfile.h" -#include "../filed/fd-plugins.h" +#include "../filed/fd_plugins.h" #ifdef HAVE_DIRENT_H #include diff --git a/bacula/src/plugins/dir/Makefile b/bacula/src/plugins/dir/Makefile index 8645dace37..1b18a57e8b 100644 --- a/bacula/src/plugins/dir/Makefile +++ b/bacula/src/plugins/dir/Makefile @@ -15,13 +15,13 @@ LIBDIR=../../lib test: main example-plugin-dir.so -dir-plugins.o: ${DIRDIR}/dir-plugins.h ${DIRDIR}/dir-plugins.c - $(CC) -I${SRCDIR} -I${DIRDIR} -DTEST_PROGRAM -c ${DIRDIR}/dir-plugins.c +dir_plugins.o: ${DIRDIR}/dir_plugins.h ${DIRDIR}/dir_plugins.c + $(CC) -I${SRCDIR} -I${DIRDIR} -DTEST_PROGRAM -c ${DIRDIR}/dir_plugins.c -main: dir-plugins.o - $(CC) -L${LIBDIR} dir-plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl +main: dir_plugins.o + $(CC) -L${LIBDIR} dir_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl -example-plugin-dir.o: example-plugin-dir.c ${DIRDIR}/dir-plugins.h +example-plugin-dir.o: example-plugin-dir.c ${DIRDIR}/dir_plugins.h $(CC) -fPIC -I../.. -I${DIRDIR} -c example-plugin-dir.c example-plugin-dir.so: example-plugin-dir.o diff --git a/bacula/src/plugins/dir/example-plugin-dir.c b/bacula/src/plugins/dir/example-plugin-dir.c index d98f120363..704243e371 100644 --- a/bacula/src/plugins/dir/example-plugin-dir.c +++ b/bacula/src/plugins/dir/example-plugin-dir.c @@ -32,7 +32,7 @@ * */ #include -#include "dir-plugins.h" +#include "dir_plugins.h" #ifdef __cplusplus extern "C" { diff --git a/bacula/src/plugins/fd/Makefile b/bacula/src/plugins/fd/Makefile index 8a27f1ec1d..ebc7fb0fed 100644 --- a/bacula/src/plugins/fd/Makefile +++ b/bacula/src/plugins/fd/Makefile @@ -17,19 +17,19 @@ all: bpipe-fd.so test: main example-plugin-fd.so -fd-plugins.o: ${FDDIR}/fd-plugins.h ${FDDIR}/fd-plugins.c - $(CC) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c ${FDDIR}/fd-plugins.c +fd_plugins.o: ${FDDIR}/fd_plugins.h ${FDDIR}/fd_plugins.c + $(CC) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c ${FDDIR}/fd_plugins.c -main: fd-plugins.o - $(CC) -L${LIBDIR} fd-plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl +main: fd_plugins.o + $(CC) -L${LIBDIR} fd_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl -example-plugin-fd.o: example-plugin-fd.c ${FDDIR}/fd-plugins.h +example-plugin-fd.o: example-plugin-fd.c ${FDDIR}/fd_plugins.h $(CC) -fPIC -I../.. -I${FDDIR} -c example-plugin-fd.c example-plugin-fd.so: example-plugin-fd.o $(CC) -shared example-plugin-fd.o -o example-plugin-fd.so -bpipe-fd.o: bpipe-fd.c ${FDDIR}/fd-plugins.h +bpipe-fd.o: bpipe-fd.c ${FDDIR}/fd_plugins.h $(CC) -fPIC -I../.. -I${FDDIR} -c bpipe-fd.c bpipe-fd.so: bpipe-fd.o diff --git a/bacula/src/plugins/fd/bpipe-fd.c b/bacula/src/plugins/fd/bpipe-fd.c index 71f384c2dd..970060dcc6 100644 --- a/bacula/src/plugins/fd/bpipe-fd.c +++ b/bacula/src/plugins/fd/bpipe-fd.c @@ -31,7 +31,7 @@ * Kern Sibbald, October 2007 * */ -#include "fd-plugins.h" +#include "fd_plugins.h" #undef malloc #undef free diff --git a/bacula/src/plugins/fd/example-plugin-fd.c b/bacula/src/plugins/fd/example-plugin-fd.c index 1b4422cffc..c0533186a2 100644 --- a/bacula/src/plugins/fd/example-plugin-fd.c +++ b/bacula/src/plugins/fd/example-plugin-fd.c @@ -32,7 +32,7 @@ * */ #include -#include "fd-plugins.h" +#include "fd_plugins.h" #ifdef __cplusplus extern "C" { diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3 index 4106cdaddd..4f81c92e71 100644 --- a/bacula/technotes-2.3 +++ b/bacula/technotes-2.3 @@ -2,6 +2,7 @@ General: 08Mar08 +kes Rename fd/dir plugin to use Bacula standard underscore. kes Plugin work -- bring dir up to fd level. kes Start implementation of VTL code kes Fix Win32 build after adding new cats subroutine. -- 2.39.5