From 40175a5e97e59ea8be86a85b4ccb971649285b60 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 27 Sep 2007 15:42:47 +0000 Subject: [PATCH] Remove debug code git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5674 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/fd_cmds.c | 3 --- bacula/src/dird/migrate.c | 1 - bacula/src/dird/msgchan.c | 3 --- bacula/src/dird/ua_output.c | 14 +++++++------- bacula/src/dird/ua_run.c | 1 - 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c index 7272325f8d..7479a73056 100644 --- a/bacula/src/dird/fd_cmds.c +++ b/bacula/src/dird/fd_cmds.c @@ -117,9 +117,6 @@ int connect_to_file_daemon(JCR *jcr, int retry_interval, int max_retry_time, */ fd->fsend(jobcmd, edit_int64(jcr->JobId, ed1), jcr->Job, jcr->VolSessionId, jcr->VolSessionTime, jcr->sd_auth_key); - if (debug_level == 3) { - Dmsg1(000, ">filed: %s", fd->msg); - } if (strcmp(jcr->sd_auth_key, "dummy") != 0) { memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key)); } diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c index c0f183d05a..e239197e35 100644 --- a/bacula/src/dird/migrate.c +++ b/bacula/src/dird/migrate.c @@ -1147,7 +1147,6 @@ void migration_cleanup(JCR *jcr, int TermCode) /* Mark previous job as migrated */ Mmsg(query, "UPDATE Job SET Type='%c' WHERE JobId=%s", (char)JT_MIGRATED_JOB, edit_uint64(jcr->previous_jr.JobId, ec1)); - Dmsg1(000, "Mark: %s\n", query.c_str()); db_sql_query(jcr->db, query.c_str(), NULL, NULL); } term_msg = _("%s -- no files to migrate"); diff --git a/bacula/src/dird/msgchan.c b/bacula/src/dird/msgchan.c index b915f55290..935a9d08ab 100644 --- a/bacula/src/dird/msgchan.c +++ b/bacula/src/dird/msgchan.c @@ -191,9 +191,6 @@ bool start_storage_daemon_job(JCR *jcr, alist *rstore, alist *wstore) Dmsg1(100, ">stored: %s\n", sd->msg); if (bget_dirmsg(sd) > 0) { Dmsg1(100, "msg); - if (debug_level == 3) { - Dmsg1(000, "msg); - } if (sscanf(sd->msg, OKjob, &jcr->VolSessionId, &jcr->VolSessionTime, &auth_key) != 3) { Dmsg1(100, "BadJob=%s\n", sd->msg); diff --git a/bacula/src/dird/ua_output.c b/bacula/src/dird/ua_output.c index 299847fee3..66dc23d51b 100644 --- a/bacula/src/dird/ua_output.c +++ b/bacula/src/dird/ua_output.c @@ -557,12 +557,12 @@ RUN *find_next_run(RUN *run, JOB *job, time_t &runtime, int ndays) bit_is_set(woy, run->woy); #ifdef xxx - Dmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled); - Dmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday)); - Dmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday)); - Dmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month)); - Dmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom)); - Dmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy)); + Pmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled); + Pmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday)); + Pmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday)); + Pmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month)); + Pmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom)); + Pmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy)); #endif if (is_scheduled) { /* Jobs scheduled on that day */ @@ -576,7 +576,7 @@ RUN *find_next_run(RUN *run, JOB *job, time_t &runtime, int ndays) } } bstrncat(buf, "\n", sizeof(buf)); - Dmsg1(000, "%s", buf); + Pmsg1(000, "%s", buf); #endif /* find time (time_t) job is to be run */ (void)localtime_r(&future, &runtm); diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c index b6ebac7121..b844db6cbc 100644 --- a/bacula/src/dird/ua_run.c +++ b/bacula/src/dird/ua_run.c @@ -245,7 +245,6 @@ try_again: if (strncasecmp(ua->cmd, ".mod ", 5) == 0 || (strncasecmp(ua->cmd, "mod ", 4) == 0 && strlen(ua->cmd) > 6)) { - Dmsg1(000, "got: %s\n", ua->cmd); parse_ua_args(ua); rc.mod = true; if (!scan_command_line_arguments(ua, rc)) { -- 2.39.5