Skip to content

Commit

Permalink
core: kBareosVersion -> kBareosVersionStrings
Browse files Browse the repository at this point in the history 
Rename the global variable and the struct to make its purpose clearer.
  • Loading branch information
@arogge
arogge committed Nov 13, 2019
1 parent ea310fa commit 9685acb
Show file tree
Hide file tree
Showing 39 changed files with 107 additions and 98 deletions.
6 changes: 3 additions & 3 deletions core/src/console/console.cc
View file
Expand Up @@ -110,7 +110,7 @@ static int EolCmd(FILE* input, BareosSocket* UA_sock);

static void usage()
{
kBareosVersion.printCopyright(stderr, 2000);
kBareosVersionStrings.PrintCopyright(stderr, 2000);
fprintf(
stderr,
_("Usage: bconsole [-s] [-c config_file] [-d debug_level]\n"
Expand Down Expand Up @@ -1225,8 +1225,8 @@ static int CheckResources()
/* @version */
static int Versioncmd(FILE* input, BareosSocket* UA_sock)
{
ConsoleOutputFormat("Version: %s (%s) %s %s %s\n", kBareosVersion.Full,
kBareosVersion.Date, HOST_OS, DISTNAME, DISTVER);
ConsoleOutputFormat("Version: %s (%s) %s %s %s\n", kBareosVersionStrings.Full,
kBareosVersionStrings.Date, HOST_OS, DISTNAME, DISTVER);
return 1;
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/console/console_conf.cc
View file
Expand Up @@ -274,7 +274,7 @@ bool PrintConfigSchemaJson(PoolMem& buffer)
json_t* json = json_object();
json_object_set_new(json, "format-version", json_integer(2));
json_object_set_new(json, "component", json_string("bconsole"));
json_object_set_new(json, "version", json_string(kBareosVersion.Full));
json_object_set_new(json, "version", json_string(kBareosVersionStrings.Full));

json_t* json_resource_object = json_object();
json_object_set(json, "resource", json_resource_object);
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/admin.cc
View file
Expand Up @@ -122,8 +122,8 @@ void AdminCleanup(JobControlRecord* jcr, int TermCode)
" End time: %s\n"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
kBareosVersion.Full, kBareosVersion.ShortDate, edt, jcr->impl->jr.JobId,
jcr->impl->jr.Job, schedt, sdt, edt, kBareosVersion.JoblogMessage,
kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, edt, jcr->impl->jr.JobId,
jcr->impl->jr.Job, schedt, sdt, edt, kBareosVersionStrings.JoblogMessage,
TermMsg);

Dmsg0(debuglevel, "Leave AdminCleanup()\n");
Expand Down
5 changes: 3 additions & 2 deletions core/src/dird/archive.cc
View file
Expand Up @@ -122,8 +122,9 @@ void ArchiveCleanup(JobControlRecord* jcr, int TermCode)
" End time: %s\n"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
kBareosVersion.Full, kBareosVersion.ShortDate, edt, jcr->impl->jr.JobId,
jcr->impl->jr.Job, schedt, sdt, edt, kBareosVersion.JoblogMessage, TermMsg);
kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, edt,
jcr->impl->jr.JobId, jcr->impl->jr.Job, schedt, sdt, edt,
kBareosVersionStrings.JoblogMessage, TermMsg);

Dmsg0(debuglevel, "Leave ArchiveCleanup()\n");
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/authenticate.cc
View file
Expand Up @@ -229,7 +229,7 @@ bool AuthenticateFileDaemon(BareosSocket* fd, char* client_name)
sleep(5);
return false;
}
fd->fsend("1000 OK: %s Version: %s (%s)\n", my_name, kBareosVersion.Full, kBareosVersion.Date);
fd->fsend("1000 OK: %s Version: %s (%s)\n", my_name, kBareosVersionStrings.Full, kBareosVersionStrings.Date);

return true;
}
Expand Down
10 changes: 5 additions & 5 deletions core/src/dird/authenticate_console.cc
View file
Expand Up @@ -127,7 +127,7 @@ class ConsoleAuthenticatorBefore_18_2 : public ConsoleAuthenticator {
if (ua_->UA_sock) {
return ua_->UA_sock->fsend(_("1000 OK: %s Version: %s (%s) "
"-- %s\n"),
my_name, kBareosVersion.Full, kBareosVersion.Date, cipher.c_str());
my_name, kBareosVersionStrings.Full, kBareosVersionStrings.Date, cipher.c_str());
}
}
return false;
Expand Down Expand Up @@ -205,8 +205,8 @@ bool ConsoleAuthenticatorFrom_18_2::SendResponseMessage(uint32_t response_id,
std::string message;
if (send_version_info) {
char version_info[128];
::snprintf(version_info, 100, "OK: %s Version: %s (%s)", my_name, kBareosVersion.Full,
kBareosVersion.Date);
::snprintf(version_info, 100, "OK: %s Version: %s (%s)", my_name, kBareosVersionStrings.Full,
kBareosVersionStrings.Date);
message = version_info;
}
return ua_->UA_sock->FormatAndSendResponseMessage(response_id, message);
Expand All @@ -215,9 +215,9 @@ bool ConsoleAuthenticatorFrom_18_2::SendResponseMessage(uint32_t response_id,
bool ConsoleAuthenticatorFrom_18_2::SendInfoMessage()
{
std::string message;
message += kBareosVersion.BinaryInfo;
message += kBareosVersionStrings.BinaryInfo;
message += " binary\n";
message += kBareosVersion.ServicesMessage;
message += kBareosVersionStrings.ServicesMessage;
message += "\n";
message += "You are ";
if (ua_->user_acl) {
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/backup.cc
View file
Expand Up @@ -1196,7 +1196,7 @@ void GenerateBackupSummary(JobControlRecord *jcr, ClientDbRecord *cr, int msg_ty
"%s" /* SecureErase status */
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
BAREOS, my_name, kBareosVersion.Full, kBareosVersion.ShortDate,
BAREOS, my_name, kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate,
HOST_OS, DISTNAME, DISTVER,
jcr->impl->jr.JobId,
jcr->impl->jr.Job,
Expand All @@ -1222,7 +1222,7 @@ void GenerateBackupSummary(JobControlRecord *jcr, ClientDbRecord *cr, int msg_ty
edit_uint64_with_suffix(mr.VolBytes, ec8),
daemon_status.c_str(),
secure_erase_status.c_str(),
kBareosVersion.JoblogMessage,
kBareosVersionStrings.JoblogMessage,
TermMsg);

/* clang-format on */
Expand Down
6 changes: 3 additions & 3 deletions core/src/dird/consolidate.cc
View file
Expand Up @@ -386,9 +386,9 @@ void ConsolidateCleanup(JobControlRecord* jcr, int TermCode)
" End time: %s\n"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
kBareosVersion.Full, kBareosVersion.ShortDate, edt, jcr->impl->jr.JobId,
jcr->impl->jr.Job, schedt, sdt, edt, kBareosVersion.JoblogMessage,
TermMsg);
kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, edt,
jcr->impl->jr.JobId, jcr->impl->jr.Job, schedt, sdt, edt,
kBareosVersionStrings.JoblogMessage, TermMsg);

Dmsg0(debuglevel, "Leave ConsolidateCleanup()\n");
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/dbcheck.cc
View file
Expand Up @@ -126,7 +126,7 @@ const int number_commands =

static void usage()
{
kBareosVersion.printCopyright(stderr, 2002);
kBareosVersionStrings.PrintCopyright(stderr, 2002);
fprintf(stderr,
"Usage: bareos-dbcheck [ options ] <working-directory> "
"<bareos-database> <user> <password> [<dbhost>] [<dbport>]\n"
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/dird.cc
View file
Expand Up @@ -187,7 +187,7 @@ static bool DirDbLogInsert(JobControlRecord* jcr, utime_t mtime, char* msg)

static void usage()
{
kBareosVersion.printCopyright(stderr, 2000);
kBareosVersionStrings.PrintCopyright(stderr, 2000);
fprintf(
stderr,
_("Usage: bareos-dir [options]\n"
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/dird_conf.cc
View file
Expand Up @@ -844,7 +844,7 @@ bool PrintConfigSchemaJson(PoolMem& buffer)
json_t* json = json_object();
json_object_set_new(json, "format-version", json_integer(2));
json_object_set_new(json, "component", json_string("bareos-dir"));
json_object_set_new(json, "version", json_string(kBareosVersion.Full));
json_object_set_new(json, "version", json_string(kBareosVersionStrings.Full));

/*
* Resources
Expand Down
18 changes: 9 additions & 9 deletions core/src/dird/migrate.cc
View file
Expand Up @@ -1766,8 +1766,8 @@ static inline void GenerateMigrateSummary(JobControlRecord* jcr,
" SD termination status: %s\n"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
BAREOS, my_name, kBareosVersion.Full, kBareosVersion.ShortDate,
HOST_OS, DISTNAME, DISTVER,
BAREOS, my_name, kBareosVersionStrings.Full,
kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
edit_uint64(jcr->impl->previous_jr.JobId, ec6),
jcr->impl->previous_jr.Job,
mig_jcr ? edit_uint64(mig_jcr->impl->jr.JobId, ec7) : _("*None*"),
Expand Down Expand Up @@ -1798,7 +1798,7 @@ static inline void GenerateMigrateSummary(JobControlRecord* jcr,
mig_jcr ? mig_jcr->VolumeName : _("*None*"), jcr->VolSessionId,
jcr->VolSessionTime, edit_uint64_with_commas(mr->VolBytes, ec4),
edit_uint64_with_suffix(mr->VolBytes, ec5), jcr->impl->SDErrors,
sd_term_msg, kBareosVersion.JoblogMessage, term_code);
sd_term_msg, kBareosVersionStrings.JoblogMessage, term_code);
} else {
/*
* Copy/Migrate selection only Job.
Expand All @@ -1815,12 +1815,12 @@ static inline void GenerateMigrateSummary(JobControlRecord* jcr,
" Priority: %d\n"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
BAREOS, my_name, kBareosVersion.Full, kBareosVersion.ShortDate,
HOST_OS, DISTNAME, DISTVER, edit_uint64(jcr->impl->jr.JobId, ec8),
jcr->impl->jr.Job, jcr->impl->res.catalog->resource_name_,
jcr->impl->res.catalog_source, sdt, edt,
edit_utime(RunTime, elapsed, sizeof(elapsed)), jcr->JobPriority,
kBareosVersion.JoblogMessage, term_code);
BAREOS, my_name, kBareosVersionStrings.Full,
kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
edit_uint64(jcr->impl->jr.JobId, ec8), jcr->impl->jr.Job,
jcr->impl->res.catalog->resource_name_, jcr->impl->res.catalog_source,
sdt, edt, edit_utime(RunTime, elapsed, sizeof(elapsed)),
jcr->JobPriority, kBareosVersionStrings.JoblogMessage, term_code);
}
}

Expand Down
15 changes: 9 additions & 6 deletions core/src/dird/restore.cc
View file
Expand Up @@ -564,14 +564,15 @@ void GenerateRestoreSummary(JobControlRecord* jcr,
" SD termination status: %s\n"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
BAREOS, my_name, kBareosVersion.Full, kBareosVersion.ShortDate,
HOST_OS, DISTNAME, DISTVER, jcr->impl->jr.JobId, jcr->impl->jr.Job,
BAREOS, my_name, kBareosVersionStrings.Full,
kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
jcr->impl->jr.JobId, jcr->impl->jr.Job,
jcr->impl->res.client->resource_name_, sdt, edt,
edit_utime(RunTime, elapsed, sizeof(elapsed)),
edit_uint64_with_commas((uint64_t)jcr->impl->ExpectedFiles, ec1),
edit_uint64_with_commas((uint64_t)jcr->impl->jr.JobFiles, ec2),
edit_uint64_with_commas(jcr->impl->jr.JobBytes, ec3), (float)kbps,
sd_term_msg, kBareosVersion.JoblogMessage, TermMsg);
sd_term_msg, kBareosVersionStrings.JoblogMessage, TermMsg);
break;
default:
if (me->secure_erase_cmdline) {
Expand Down Expand Up @@ -608,15 +609,17 @@ void GenerateRestoreSummary(JobControlRecord* jcr,
"%s"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
BAREOS, my_name, kBareosVersion.Full, kBareosVersion.ShortDate,
HOST_OS, DISTNAME, DISTVER, jcr->impl->jr.JobId, jcr->impl->jr.Job,
BAREOS, my_name, kBareosVersionStrings.Full,
kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
jcr->impl->jr.JobId, jcr->impl->jr.Job,
jcr->impl->res.client->resource_name_, sdt, edt,
edit_utime(RunTime, elapsed, sizeof(elapsed)),
edit_uint64_with_commas((uint64_t)jcr->impl->ExpectedFiles, ec1),
edit_uint64_with_commas((uint64_t)jcr->impl->jr.JobFiles, ec2),
edit_uint64_with_commas(jcr->impl->jr.JobBytes, ec3), (float)kbps,
jcr->JobErrors, fd_term_msg, sd_term_msg,
secure_erase_status.c_str(), kBareosVersion.JoblogMessage, TermMsg);
secure_erase_status.c_str(), kBareosVersionStrings.JoblogMessage,
TermMsg);
break;
}
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/ua_cmds.cc
View file
Expand Up @@ -2806,8 +2806,8 @@ static bool VersionCmd(UaContext* ua, const char* cmd)
ua->send->ObjectStart("version");
ua->send->ObjectKeyValue("name", my_name, "%s ");
ua->send->ObjectKeyValue("type", "bareos-director");
ua->send->ObjectKeyValue("Version", "%s: ", kBareosVersion.Full, "%s ");
ua->send->ObjectKeyValue("bdate", kBareosVersion.Date, "(%s) ");
ua->send->ObjectKeyValue("Version", "%s: ", kBareosVersionStrings.Full, "%s ");
ua->send->ObjectKeyValue("bdate", kBareosVersionStrings.Date, "(%s) ");
ua->send->ObjectKeyValue("operatingsystem", HOST_OS, "%s ");
ua->send->ObjectKeyValue("distname", DISTNAME, "%s ");
ua->send->ObjectKeyValue("distversion", DISTVER, "%s ");
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/ua_status.cc
View file
Expand Up @@ -354,12 +354,12 @@ void ListDirStatusHeader(UaContext* ua)
dbdrivers.strcat(catalog->db_driver);
cnt++;
}
ua->SendMsg(_("%s Version: %s (%s) %s %s %s\n"), my_name, kBareosVersion.Full, kBareosVersion.Date,
ua->SendMsg(_("%s Version: %s (%s) %s %s %s\n"), my_name, kBareosVersionStrings.Full, kBareosVersionStrings.Date,
HOST_OS, DISTNAME, DISTVER);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
ua->SendMsg(
_("Daemon started %s. Jobs: run=%d, running=%d db:%s, %s binary\n"), dt,
num_jobs_run, JobCount(), dbdrivers.c_str(), kBareosVersion.BinaryInfo);
num_jobs_run, JobCount(), dbdrivers.c_str(), kBareosVersionStrings.BinaryInfo);

if (me->secure_erase_cmdline) {
ua->SendMsg(_(" secure erase command='%s'\n"), me->secure_erase_cmdline);
Expand Down
29 changes: 17 additions & 12 deletions core/src/dird/verify.cc
View file
Expand Up @@ -569,13 +569,16 @@ void VerifyCleanup(JobControlRecord* jcr, int TermCode)
" SD termination status: %s\n"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
BAREOS, my_name, kBareosVersion.Full, kBareosVersion.ShortDate,
HOST_OS, DISTNAME, DISTVER, jcr->impl->jr.JobId, jcr->impl->jr.Job,
BAREOS, my_name, kBareosVersionStrings.Full,
kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
jcr->impl->jr.JobId, jcr->impl->jr.Job,
jcr->impl->res.fileset->resource_name_, JobLevelToString(JobLevel),
jcr->impl->res.client->resource_name_, jcr->impl->previous_jr.JobId, Name, sdt,
edt, edit_uint64_with_commas(jcr->impl->ExpectedFiles, ec1),
jcr->impl->res.client->resource_name_, jcr->impl->previous_jr.JobId,
Name, sdt, edt,
edit_uint64_with_commas(jcr->impl->ExpectedFiles, ec1),
edit_uint64_with_commas(jcr->JobFiles, ec2), jcr->JobErrors,
fd_term_msg, sd_term_msg, kBareosVersion.JoblogMessage, TermMsg);
fd_term_msg, sd_term_msg, kBareosVersionStrings.JoblogMessage,
TermMsg);
break;
default:
Jmsg(jcr, msg_type, 0,
Expand All @@ -595,12 +598,14 @@ void VerifyCleanup(JobControlRecord* jcr, int TermCode)
" FD termination status: %s\n"
" Bareos binary info: %s\n"
" Termination: %s\n\n"),
BAREOS, my_name, kBareosVersion.Full, kBareosVersion.ShortDate,
HOST_OS, DISTNAME, DISTVER, jcr->impl->jr.JobId, jcr->impl->jr.Job,
BAREOS, my_name, kBareosVersionStrings.Full,
kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
jcr->impl->jr.JobId, jcr->impl->jr.Job,
jcr->impl->res.fileset->resource_name_, JobLevelToString(JobLevel),
jcr->impl->res.client->resource_name_, jcr->impl->previous_jr.JobId, Name, sdt,
edt, edit_uint64_with_commas(jcr->JobFiles, ec1), jcr->JobErrors,
fd_term_msg, kBareosVersion.JoblogMessage, TermMsg);
jcr->impl->res.client->resource_name_, jcr->impl->previous_jr.JobId,
Name, sdt, edt, edit_uint64_with_commas(jcr->JobFiles, ec1),
jcr->JobErrors, fd_term_msg, kBareosVersionStrings.JoblogMessage,
TermMsg);
break;
}

Expand Down Expand Up @@ -697,8 +702,8 @@ void GetAttributesAndCompareToCatalog(JobControlRecord* jcr, JobId_t JobId)
* Find equivalent record in the database
*/
fdbr.FileId = 0;
if (!jcr->db->GetFileAttributesRecord(
jcr, jcr->impl->fname, &jcr->impl->previous_jr, &fdbr)) {
if (!jcr->db->GetFileAttributesRecord(jcr, jcr->impl->fname,
&jcr->impl->previous_jr, &fdbr)) {
Jmsg(jcr, M_INFO, 0, _("New file: %s\n"), jcr->impl->fname);
Dmsg1(020, _("File not in catalog: %s\n"), jcr->impl->fname);
jcr->setJobStatus(JS_Differences);
Expand Down
4 changes: 2 additions & 2 deletions core/src/filed/dir_cmd.cc
View file
Expand Up @@ -1007,9 +1007,9 @@ static bool job_cmd(JobControlRecord* jcr)
#endif

#if !defined(IS_BUILD_ON_OBS)
return dir->fsend(OKjob, kBareosVersion.Full, kBareosVersion.ShortDate, os_version, DISTNAME, DISTVER);
return dir->fsend(OKjob, kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, os_version, DISTNAME, DISTVER);
#else
return dir->fsend(OKjob, kBareosVersion.Full, kBareosVersion.ShortDate, os_version, DISTNAME, DISTVER,
return dir->fsend(OKjob, kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, os_version, DISTNAME, DISTVER,
OBS_DISTRIBUTION, OBS_ARCH);
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/filed/fd_plugins.cc
View file
Expand Up @@ -2065,7 +2065,7 @@ static bRC bareosGetValue(bpContext* ctx, bVariable var, void* value)
*(char**)value = exepath;
break;
case bVarVersion:
*(const char**)value = kBareosVersion.FullWithDate;
*(const char**)value = kBareosVersionStrings.FullWithDate;
break;
case bVarDistName:
*(char**)value = dist_name;
Expand Down
2 changes: 1 addition & 1 deletion core/src/filed/filed.cc
View file
Expand Up @@ -55,7 +55,7 @@ static bool foreground = false;

static void usage()
{
kBareosVersion.printCopyright(stderr, 2000);
kBareosVersionStrings.PrintCopyright(stderr, 2000);
fprintf(
stderr,
_("Usage: bareos-fd [options]\n"
Expand Down
2 changes: 1 addition & 1 deletion core/src/filed/filed_conf.cc
View file
Expand Up @@ -286,7 +286,7 @@ bool PrintConfigSchemaJson(PoolMem& buffer)
json_t* json = json_object();
json_object_set_new(json, "format-version", json_integer(2));
json_object_set_new(json, "component", json_string("bareos-fd"));
json_object_set_new(json, "version", json_string(kBareosVersion.Full));
json_object_set_new(json, "version", json_string(kBareosVersionStrings.Full));

/*
* Resources
Expand Down
6 changes: 3 additions & 3 deletions core/src/filed/status.cc
View file
Expand Up @@ -90,12 +90,12 @@ static void ListStatusHeader(StatusPacket* sp)
char buf[300];
#endif

len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"), my_name, kBareosVersion.Date,
kBareosVersion.Date, VSS, HOST_OS, DISTNAME, DISTVER);
len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"), my_name, kBareosVersionStrings.Date,
kBareosVersionStrings.Date, VSS, HOST_OS, DISTNAME, DISTVER);
sendit(msg, len, sp);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d, %s binary\n"),
dt, num_jobs_run, JobCount(), kBareosVersion.BinaryInfo);
dt, num_jobs_run, JobCount(), kBareosVersionStrings.BinaryInfo);
sendit(msg, len, sp);

#if defined(HAVE_WIN32)
Expand Down
2 changes: 1 addition & 1 deletion core/src/lib/bsock.cc
View file
Expand Up @@ -343,7 +343,7 @@ bool BareosSocket::ConsoleAuthenticateWithDirector(

dir->StartTimer(60 * 5); /* 5 minutes */
dir->InitBnetDump(own_qualified_name);
dir->fsend("Hello %s calling version %s\n", bashed_name, kBareosVersion.Full);
dir->fsend("Hello %s calling version %s\n", bashed_name, kBareosVersionStrings.Full);

if (!AuthenticateOutboundConnection(jcr, own_qualified_name, identity,
password, tls_resource)) {
Expand Down

0 comments on commit 9685acb

Please sign in to comment.