Change cryptic aop name

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index 5d3036a942687c72d5fb01008269eb5acfd8b1a9..cfe2a3c40ff09974475b7d8b6a1dbc76bc8564ef 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -356,7 +356,7 @@ void InitWinAPIWrapper();
 /**
  * Actions on purge (bit mask)
  */
-#define AOP_TRUNCATE 1
+#define ON_PURGE_TRUNCATE 1
 
 /* Size of File Address stored in STREAM_SPARSE_DATA. Do NOT change! */
 #define SPARSE_FADDR_SIZE (sizeof(uint64_t))

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index da7db734466012bfe46cb3f5cd8999605ef3c4a4..ca1d5f9ab47afc6d287162c4187c11a113b4cc8e 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -46,7 +46,6 @@
  *
  *     Kern Sibbald, January MM
  *
- *     Version $Id$
  */
 
 
@@ -1622,7 +1621,7 @@ static void store_actiononpurge(LEX *lc, RES_ITEM *item, int index, int pass)
    uint32_t *destination = (uint32_t*)item->value;
    lex_get_token(lc, T_NAME);
    if (strcasecmp(lc->str, "truncate") == 0) {
-      *destination = (*destination) | AOP_TRUNCATE;
+      *destination = (*destination) | ON_PURGE_TRUNCATE;
    } else {
       scan_err2(lc, _("Expected one of: %s, got: %s"), "Truncate", lc->str);
       return;

diff --git a/bacula/src/dird/ua_purge.c b/bacula/src/dird/ua_purge.c
index 1b7fc0f0e1ed38aefe8d927e5204f911bc90ffde..7d1dd4621d23f650cd2ea0e8df02360c76c5ab31 100644 (file)
--- a/bacula/src/dird/ua_purge.c
+++ b/bacula/src/dird/ua_purge.c
@@ -589,7 +589,7 @@ static void do_truncate_on_purge(UAContext *ua, MEDIA_DBR *mr,
       return;
    }
 
-   if (mr->ActionOnPurge & AOP_TRUNCATE) {
+   if (mr->ActionOnPurge & ON_PURGE_TRUNCATE) {
       /* Send the command to truncate the volume after purge. If this feature
        * is disabled for the specific device, this will be a no-op.
        */

diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c
index d430fda8cf50d64672f8df681c7eb85fad224f54..7728baf01c9120e17b599b8bcbb01ca1e1c8ff00 100644 (file)
--- a/bacula/src/dird/ua_update.c
+++ b/bacula/src/dird/ua_update.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -32,7 +32,6 @@
  *
  *     Kern Sibbald, September MM
  *
- *   Version $Id$
  */
 
 #include "bacula.h"
@@ -478,7 +477,7 @@ static void update_vol_actiononpurge(UAContext *ua, char *val, MEDIA_DBR *mr)
 {
    POOL_MEM ret;
    if (strcasecmp(val, "truncate") == 0) {
-      mr->ActionOnPurge = AOP_TRUNCATE;
+      mr->ActionOnPurge = ON_PURGE_TRUNCATE;
    } else {
       mr->ActionOnPurge = 0;
    }
@@ -488,7 +487,7 @@ static void update_vol_actiononpurge(UAContext *ua, char *val, MEDIA_DBR *mr)
                     db_strerror(ua->db));
    } else {
       ua->info_msg(_("New ActionOnPurge is: %s\n"), 
-                   aop_to_str(mr->ActionOnPurge, ret));
+                   action_on_purge_to_string(mr->ActionOnPurge, ret));
    }
 }
 
@@ -587,9 +586,9 @@ static int update_volume(UAContext *ua)
          case 13:
             update_vol_recyclepool(ua, ua->argv[j], &mr);
             break;
-        case 14:
-           update_vol_actiononpurge(ua, ua->argv[j], &mr);
-           break;
+         case 14:
+            update_vol_actiononpurge(ua, ua->argv[j], &mr);
+            break;
          }
          done = true;
       }
@@ -818,14 +817,14 @@ static int update_volume(UAContext *ua)
 
       case 16:
          pm_strcpy(ret, "");
-        ua->info_msg(_("Current ActionOnPurge is: %s\n"), 
-                      aop_to_str(mr.ActionOnPurge, ret));
-        if (!get_cmd(ua, _("Enter new ActionOnPurge (one of: Truncate, None): "))) {
+         ua->info_msg(_("Current ActionOnPurge is: %s\n"), 
+                      action_on_purge_to_string(mr.ActionOnPurge, ret));
+         if (!get_cmd(ua, _("Enter new ActionOnPurge (one of: Truncate, None): "))) {
             return 0;
-        }
+         }
 
          update_vol_actiononpurge(ua, ua->cmd, &mr);
-        break;
+         break;
 
       default:                        /* Done or error */
          ua->info_msg(_("Selection terminated.\n"));

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 9de59dc2963924217e450f9ccc5b0216d6801498..6e024ea1618095f9851c94af42567d6414a0dd7d 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -321,7 +321,7 @@ void             jobstatus_to_ascii      (int JobStatus, char *msg, int maxlen);
 void             jobstatus_to_ascii_gui  (int JobStatus, char *msg, int maxlen);
 int              run_program             (char *prog, int wait, POOLMEM *&results);
 int              run_program_full_output (char *prog, int wait, POOLMEM *&results);
-char *           aop_to_str              (int aop, POOL_MEM &ret);
+char *           action_on_purge_to_string(int aop, POOL_MEM &ret);
 const char *     job_type_to_str         (int type);
 const char *     job_status_to_str       (int stat);
 const char *     job_level_to_str        (int level);

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 06f685806a29c27bdb182ea1b277b16a785c0764..e7bb7aa4966a98cc2e542ea03dd91c6387ab3d48 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -397,9 +397,9 @@ const char *job_type_to_str(int type)
 
 /* Convert ActionOnPurge to string (Truncate, Erase, Destroy)
  */
-char *aop_to_str(int aop, POOL_MEM &ret)
+char *action_on_purge_to_string(int aop, POOL_MEM &ret)
 {
-   if (aop & AOP_TRUNCATE) {
+   if (aop & ON_PURGE_TRUNCATE) {
       pm_strcpy(ret, _("Truncate"));
    }
    if (!aop) {