From 23bea87866ec8d0b21064fce72bd4f4bab249b81 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 9 Mar 2005 11:57:04 +0000 Subject: [PATCH] - 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 --- bacula/src/stored/dev.c | 9 +++++++-- bacula/src/version.h | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c index bd8a9fe3f0..a9f826ad87 100644 --- 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 dd6d6bbf06..8d7a7f6be6 100644 --- 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 -- 2.39.5