+/*
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2017 Kern Sibbald
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
+*/
/*
*
* Bacula Director -- expand.c -- does variable expansion
* in particular for the LabelFormat specification.
*
* Kern Sibbald, June MMIII
- *
- * Version $Id$
- */
-/*
- Copyright (C) 2003-2004 Kern Sibbald and John Walker
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
-
*/
#include "bacula.h"
{
struct tm tm;
time_t now = time(NULL);
- localtime_r(&now, &tm);
+ (void)localtime_r(&now, &tm);
int val = 0;
char buf[10];
switch (code) {
case 1: /* Job */
- str = jcr->job->hdr.name;
+ str = jcr->job->name();
break;
case 2: /* Director's name */
str = my_name;
break;
case 3: /* level */
- str = job_level_to_str(jcr->JobLevel);
+ str = job_level_to_str(jcr->getJobLevel());
break;
case 4: /* type */
- str = job_type_to_str(jcr->JobType);
+ str = job_type_to_str(jcr->getJobType());
break;
case 5: /* JobId */
bsnprintf(buf, sizeof(buf), "%d", jcr->JobId);
str = buf;
break;
case 6: /* Client */
- str = jcr->client->hdr.name;
+ str = jcr->client->name();
if (!str) {
str = " ";
}
str = buf;
break;
case 8: /* Pool */
- str = jcr->pool->hdr.name;
+ str = jcr->pool->name();
break;
case 9: /* Storage */
- str = jcr->store->hdr.name;
+ if (jcr->wstore) {
+ str = jcr->wstore->name();
+ } else {
+ str = jcr->rstore->name();
+ }
break;
case 10: /* Catalog */
- str = jcr->catalog->hdr.name;
+ str = jcr->catalog->name();
break;
case 11: /* MediaType */
- str = jcr->store->media_type;
+ if (jcr->wstore) {
+ str = jcr->wstore->media_type;
+ } else {
+ str = jcr->rstore->media_type;
+ }
break;
case 12: /* JobName */
str = jcr->Job;
return 1;
}
-
struct s_built_in_vars {const char *var_name; int code; int (*func)(JCR *jcr, int code,
const char **val_ptr, int *val_len, int *val_size);};
buf[var_len] = 0;
LockRes();
for (COUNTER *counter=NULL; (counter = (COUNTER *)GetNextRes(R_COUNTER, (RES *)counter)); ) {
- if (strcmp(counter->hdr.name, buf) == 0) {
+ if (strcmp(counter->name(), buf) == 0) {
Dmsg2(100, "Counter=%s val=%d\n", buf, counter->CurrentValue);
/* -1 => return size of array */
if (var_index == -1) {
COUNTER_DBR cr;
JCR *jcr = (JCR *)my_ctx;
memset(&cr, 0, sizeof(cr));
- bstrncpy(cr.Counter, counter->hdr.name, sizeof(cr.Counter));
+ bstrncpy(cr.Counter, counter->name(), sizeof(cr.Counter));
cr.MinValue = counter->MinValue;
cr.MaxValue = counter->MaxValue;
cr.CurrentValue = counter->CurrentValue;
Dmsg1(100, "New value=%d\n", cr.CurrentValue);
if (counter->WrapCounter) {
- bstrncpy(cr.WrapCounter, counter->WrapCounter->hdr.name, sizeof(cr.WrapCounter));
+ bstrncpy(cr.WrapCounter, counter->WrapCounter->name(), sizeof(cr.WrapCounter));
} else {
cr.WrapCounter[0] = 0;
}
if (!db_update_counter_record(jcr, jcr->db, &cr)) {
Jmsg(jcr, M_ERROR, 0, _("Count not update counter %s: ERR=%s\n"),
- counter->hdr.name, db_strerror(jcr->db));
+ counter->name(), db_strerror(jcr->db));
}
}
}
Dmsg1(100, "Val=%s\n", buf);
LockRes();
for (COUNTER *counter=NULL; (counter = (COUNTER *)GetNextRes(R_COUNTER, (RES *)counter)); ) {
- if (strcmp(counter->hdr.name, buf) == 0) {
- Dmsg2(100, "counter=%s val=%s\n", counter->hdr.name, buf);
+ if (strcmp(counter->name(), buf) == 0) {
+ Dmsg2(100, "counter=%s val=%s\n", counter->name(), buf);
break;
}
}