- Edit Resource-name (physical-name) for the device name

  everywhere in the SD.
- Remove .linked.tex files in preparation for cutover to
  using .tex in place of .wml.

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

diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index bd8a9fe3f08717b664bf2ef73d835af6b3555d54..a9f826ad873f470dd47342025cca4e9986131b44 100644 (file)
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -149,8 +149,9 @@ init_dev(JCR *jcr, DEVICE *dev, DEVRES *device)
    /* Copy user supplied device parameters from Resource */
    dev->dev_name = get_memory(strlen(device->device_name)+1);
    pm_strcpy(dev->dev_name, device->device_name);
-   dev->prt_name = get_memory(strlen(device->device_name) + strlen(device->hdr.name) + 10);
-   Mmsg(dev->prt_name, "\"%s\" (%s)", device->device_name, device->hdr.name);
+   dev->prt_name = get_memory(strlen(device->device_name) + strlen(device->hdr.name) + 20);
+   /* We edit "Resource-name" (physical-name) */
+   Mmsg(dev->prt_name, "\"%s\" (%s)", device->hdr.name, device->device_name);
    dev->capabilities = device->cap_bits;
    dev->min_block_size = device->min_block_size;
    dev->max_block_size = device->max_block_size;
@@ -1628,6 +1629,10 @@ term_dev(DEVICE *dev)
       free_memory(dev->dev_name);
       dev->dev_name = NULL;
    }
+   if (dev->prt_name) {
+      free_memory(dev->prt_name);
+      dev->prt_name = NULL;
+   }
    if (dev->errmsg) {
       free_pool_memory(dev->errmsg);
       dev->errmsg = NULL;

diff --git a/bacula/src/version.h b/bacula/src/version.h
index dd6d6bbf0620a481103f70ff58bd6e5f848ca30a..8d7a7f6be60c94139f7ec0d3d6e3dfb063337401 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.6"
-#define BDATE   "08 March 2005"
-#define LSMDATE "08Mar05"
+#define BDATE   "09 March 2005"
+#define LSMDATE "09Mar05"
 
 /* Debug flags */
 #undef  DEBUG