Remove some old reader/writer code

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7646 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/inc_conf.c b/bacula/src/dird/inc_conf.c
index 809e40515e50d628ac9390cb26cf4c00156d1e67..1372cb852043c9ca12d56dc8e138b3f3a47c1232 100644 (file)
--- a/bacula/src/dird/inc_conf.c
+++ b/bacula/src/dird/inc_conf.c
@@ -57,9 +57,7 @@ static void store_plugin_name(LEX *lc, RES_ITEM *item, int index, int pass);
 static void options_res(LEX *lc, RES_ITEM *item, int index, int pass);
 static void store_base(LEX *lc, RES_ITEM *item, int index, int pass);
 static void store_plugin(LEX *lc, RES_ITEM *item, int index, int pass);
-static void store_reader(LEX *lc, RES_ITEM *item, int index, int pass);
 static void store_ignoredir(LEX *lc, RES_ITEM *item, int index, int pass);
-static void store_writer(LEX *lc, RES_ITEM *item, int index, int pass);
 static void setup_current_opts(void);
 
 
@@ -119,8 +117,6 @@ static RES_ITEM options_items[] = {
    {"exclude",         store_opts,    {0},     0, 0, 0},
    {"aclsupport",      store_opts,    {0},     0, 0, 0},
    {"plugin",          store_plugin,  {0},     0, 0, 0},
-   {"reader",          store_reader,  {0},     0, 0, 0},
-   {"writer",          store_writer,  {0},     0, 0, 0},
    {"ignorecase",      store_opts,    {0},     0, 0, 0},
    {"fstype",          store_fstype,  {0},     0, 0, 0},
    {"hfsplussupport",  store_opts,    {0},     0, 0, 0},
@@ -506,38 +502,6 @@ static void store_plugin(LEX *lc, RES_ITEM *item, int index, int pass)
 }
 
 
-/* Store reader info */
-static void store_reader(LEX *lc, RES_ITEM *item, int index, int pass)
-{
-   int token;
-
-   token = lex_get_token(lc, T_NAME);
-   if (pass == 1) {
-      /*
-       * Pickup reader command
-       */
-      res_incexe.current_opts->reader = bstrdup(lc->str);
-   }
-   scan_to_eol(lc);
-}
-
-/* Store writer innfo */
-static void store_writer(LEX *lc, RES_ITEM *item, int index, int pass)
-{
-   int token;
-
-   token = lex_get_token(lc, T_NAME);
-   if (pass == 1) {
-      /*
-       * Pickup writer command
-       */
-      res_incexe.current_opts->writer = bstrdup(lc->str);
-   }
-   scan_to_eol(lc);
-}
-
-
-
 /* Store Wild-card info */
 static void store_wild(LEX *lc, RES_ITEM *item, int index, int pass)
 {

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 523bcb27c11c0e6b01e8bb36f4028880ccae94a0..eab33fbe5a88202b767d64987e629c4688fc1c2d 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -19,6 +19,7 @@ remove reader/writer in FOPTS????
 
 General:
 25Sep08
+kes  Remove some old reader/writer code.
 kes  Implement ./configure --with-plugindir=xxx
 ebl  Fix the mysql bug in the new accurate code
 kes  Improve plugin debug. Create plugin test.