Skip to content

Commit

Permalink
Remove obscure beef variable.
Browse files Browse the repository at this point in the history
As we don't have an enterprise version we don't need a bareos
enable enterprise feature flag.
  • Loading branch information
Marco van Wieringen committed May 5, 2013
1 parent bc8dd47 commit 40953f5
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 19 deletions.
1 change: 0 additions & 1 deletion scripts/btraceback.dbx
Expand Up @@ -10,7 +10,6 @@ echo "host_os ==> \c"; print -l (char *)host_os
echo "distname ==> \c"; print -l (char *)distname
echo "distver ==> \c"; print -l (char *)distver
echo "dist_name ==> \c"; print -l (char *)dist_name
echo "beef ==> \c"; print -l (int)beef

echo "******** RUNNING THREADS/LWPS:"
echo
Expand Down
1 change: 0 additions & 1 deletion scripts/btraceback.gdb
Expand Up @@ -8,7 +8,6 @@ print distname
print distver
print host_name
print dist_name
print beef
show env TestName
bt
thread apply all bt
Expand Down
5 changes: 2 additions & 3 deletions src/dird/ua_status.c
Expand Up @@ -364,9 +364,8 @@ void list_dir_status_header(UAContext *ua)
ua->send_msg(_("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE,
HOST_OS, DISTNAME, DISTVER);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
ua->send_msg(_("Daemon started %s. Jobs: run=%d, running=%d "
"mode=%d,%d\n"), dt,
num_jobs_run, job_count(), (int)DEVELOPER_MODE, (int)BEEF);
ua->send_msg(_("Daemon started %s. Jobs: run=%d, running=%d mode=%d\n"),
dt, num_jobs_run, job_count(), (int)DEVELOPER_MODE);
ua->send_msg(_(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1),
edit_uint64_with_commas(sm_bytes, b2),
Expand Down
5 changes: 0 additions & 5 deletions src/filed/fd_plugins.c
Expand Up @@ -32,7 +32,6 @@ extern CLIENTRES *me;
extern DLL_IMP_EXP char *exepath;
extern DLL_IMP_EXP char *version;
extern DLL_IMP_EXP char *dist_name;
extern DLL_IMP_EXP int beef;

const int dbglvl = 150;
#ifdef HAVE_WIN32
Expand Down Expand Up @@ -1486,9 +1485,6 @@ static bRC bareosGetValue(bpContext *ctx, bVariable var, void *value)
case bVarDistName:
*(char **)value = dist_name;
break;
case bVarBEEF:
*((int *)value) = beef;
break;
default:
break;
}
Expand Down Expand Up @@ -1571,7 +1567,6 @@ static bRC bareosGetValue(bpContext *ctx, bVariable var, void *value)
case bVarExePath:
case bVarVersion:
case bVarDistName:
case bVarBEEF:
break;
}
Dsm_check(999);
Expand Down
5 changes: 2 additions & 3 deletions src/filed/fd_plugins.h
Expand Up @@ -172,9 +172,8 @@ typedef enum {
bVarExePath = 16,
bVarVersion = 17,
bVarDistName = 18,
bVarBEEF = 19,
bVarPrevJobName = 20,
bVarPrefixLinks = 21
bVarPrevJobName = 19,
bVarPrefixLinks = 20
} bVariable;

/*
Expand Down
1 change: 0 additions & 1 deletion src/include/version.h
Expand Up @@ -136,7 +136,6 @@
/* #define DEBUG_MEMSET 1 */
/* #define DEBUG_MUTEX 1 */
/* #define DEBUG_BLOCK_CHECKSUM 1 */
#define BEEF 0

/*
* Set SMALLOC_SANITY_CHECK to zero to turn off, otherwise
Expand Down
1 change: 0 additions & 1 deletion src/lib/message.c
Expand Up @@ -51,7 +51,6 @@ bool prt_kaboom = false; /* Print kaboom output */
utime_t daemon_start_time = 0; /* Daemon start time */
const char *version = VERSION " (" BDATE ")";
const char *dist_name = DISTNAME " " DISTVER;
int beef = BEEF;
char my_name[128] = {0}; /* daemon name is stored here */
char host_name[256] = {0}; /* host machine name */
char *exepath = (char *)NULL;
Expand Down
5 changes: 2 additions & 3 deletions src/stored/status.c
Expand Up @@ -257,10 +257,9 @@ static void list_status_header(STATUS_PKT *sp)
edit_uint64_with_commas(sm_buffers, b4),
edit_uint64_with_commas(sm_max_buffers, b5));
sendit(msg, len, sp);
len = Mmsg(msg, " Sizes: boffset_t=%d size_t=%d int32_t=%d int64_t=%d "
"mode=%d,%d\n",
len = Mmsg(msg, " Sizes: boffset_t=%d size_t=%d int32_t=%d int64_t=%d mode=%d\n",
(int)sizeof(boffset_t), (int)sizeof(size_t), (int)sizeof(int32_t),
(int)sizeof(int64_t), (int)DEVELOPER_MODE, (int)BEEF);
(int)sizeof(int64_t), (int)DEVELOPER_MODE);
sendit(msg, len, sp);

len = list_sd_plugins(msg);
Expand Down
1 change: 0 additions & 1 deletion src/win32/lib/make_def
Expand Up @@ -32,7 +32,6 @@ done
DATA="\
console_command \
exepath \
beef \
version \
dist_name \
"
Expand Down

0 comments on commit 40953f5

Please sign in to comment.