Rename bro to zeek in error messages

More renaming in error messages and a few other places.
This commit is contained in:
Daniel Thayer 2019-06-16 23:06:21 -05:00
parent e2dc0092f3
commit 0ae1bfa29d
11 changed files with 12 additions and 12 deletions

View file

@ -10,8 +10,8 @@ set(bro_ALL_GENERATED_OUTPUTS CACHE INTERNAL "automatically generated files" FO
set(bro_AUTO_BIFS CACHE INTERNAL "BIFs for automatic inclusion" FORCE) set(bro_AUTO_BIFS CACHE INTERNAL "BIFs for automatic inclusion" FORCE)
set(bro_REGISTER_BIFS CACHE INTERNAL "BIFs for automatic registering" FORCE) set(bro_REGISTER_BIFS CACHE INTERNAL "BIFs for automatic registering" FORCE)
set(bro_BASE_BIF_SCRIPTS CACHE INTERNAL "Bro script stubs for BIFs in base distribution of Bro" FORCE) set(bro_BASE_BIF_SCRIPTS CACHE INTERNAL "Zeek script stubs for BIFs in base distribution of Zeek" FORCE)
set(bro_PLUGIN_BIF_SCRIPTS CACHE INTERNAL "Bro script stubs for BIFs in Bro plugins" FORCE) set(bro_PLUGIN_BIF_SCRIPTS CACHE INTERNAL "Zeek script stubs for BIFs in Zeek plugins" FORCE)
# If TRUE, use CMake's object libraries for sub-directories instead of # If TRUE, use CMake's object libraries for sub-directories instead of
# static libraries. This requires CMake >= 2.8.8. # static libraries. This requires CMake >= 2.8.8.

View file

@ -721,7 +721,7 @@ static char* get_prompt(bool reset_counter = false)
if ( reset_counter ) if ( reset_counter )
counter = 0; counter = 0;
safe_snprintf(prompt, sizeof(prompt), "(Bro [%d]) ", counter++); safe_snprintf(prompt, sizeof(prompt), "(Zeek [%d]) ", counter++);
return prompt; return prompt;
} }

View file

@ -35,7 +35,7 @@ void init_global_dbg_constants () {
"quit" "quit"
}; };
info = new DebugCmdInfo (dcQuit, names, 1, false, "Exit Bro", info = new DebugCmdInfo (dcQuit, names, 1, false, "Exit Zeek",
false); false);
g_DebugCmdInfos.push_back(info); g_DebugCmdInfos.push_back(info);
} }

View file

@ -13,7 +13,7 @@ help: Get help with debugger commands
cmd: dcQuit cmd: dcQuit
names: quit names: quit
resume: false resume: false
help: Exit Bro help: Exit Zeek
cmd: dcNext cmd: dcNext
names: next names: next

View file

@ -72,7 +72,7 @@ void DebugLogger::ShowStreamsHelp()
fprintf(stderr," %s\n", streams[i].prefix); fprintf(stderr," %s\n", streams[i].prefix);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, " plugin-<plugin-name> (replace '::' in name with '-'; e.g., '-B plugin-Bro-Netmap')\n"); fprintf(stderr, " plugin-<plugin-name> (replace '::' in name with '-'; e.g., '-B plugin-Zeek-Netmap')\n");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "Pseudo streams\n"); fprintf(stderr, "Pseudo streams\n");
fprintf(stderr, " verbose Increase verbosity.\n"); fprintf(stderr, " verbose Increase verbosity.\n");

View file

@ -26,7 +26,7 @@ void init_hash_function()
{ {
// Make sure we have already called init_random_seed(). // Make sure we have already called init_random_seed().
if ( ! (hmac_key_set && siphash_key_set) ) if ( ! (hmac_key_set && siphash_key_set) )
reporter->InternalError("Bro's hash functions aren't fully initialized"); reporter->InternalError("Zeek's hash functions aren't fully initialized");
} }
HashKey::HashKey(bro_int_t i) HashKey::HashKey(bro_int_t i)

View file

@ -887,7 +887,7 @@ bool FileSerializer::ReadHeader(UnserialInfo* info)
if ( magic != htonl(MAGIC) ) if ( magic != htonl(MAGIC) )
{ {
Error(fmt("%s is not a bro state file", file)); Error(fmt("%s is not a Zeek state file", file));
CloseFile(); CloseFile();
return false; return false;
} }

View file

@ -1,5 +1,5 @@
##! Functions and events regarding Bro's broker communication mechanisms. ##! Functions and events regarding broker communication mechanisms.
%%{ %%{
#include "broker/Manager.h" #include "broker/Manager.h"

View file

@ -71,7 +71,7 @@ bool SQLite::DoInit(const ReaderInfo& info, int arg_num_fields, const threading:
{ {
if ( sqlite3_threadsafe() == 0 ) if ( sqlite3_threadsafe() == 0 )
{ {
Error("SQLite reports that it is not threadsafe. Bro needs a threadsafe version of SQLite. Aborting"); Error("SQLite reports that it is not threadsafe. Zeek needs a threadsafe version of SQLite. Aborting");
return false; return false;
} }

View file

@ -116,7 +116,7 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields,
{ {
if ( sqlite3_threadsafe() == 0 ) if ( sqlite3_threadsafe() == 0 )
{ {
Error("SQLite reports that it is not threadsafe. Bro needs a threadsafe version of SQLite. Aborting"); Error("SQLite reports that it is not threadsafe. Zeek needs a threadsafe version of SQLite. Aborting");
return false; return false;
} }

View file

@ -83,7 +83,7 @@ Manager::Manager(const string& arg_config, const string& bro_command)
// a PATH component that starts with a tilde (such as "~/bin"). A simple // a PATH component that starts with a tilde (such as "~/bin"). A simple
// workaround is to just run bro with a relative or absolute path. // workaround is to just run bro with a relative or absolute path.
if ( path_to_bro.empty() || stat(path_to_bro.c_str(), &s) < 0 ) if ( path_to_bro.empty() || stat(path_to_bro.c_str(), &s) < 0 )
reporter->InternalError("Zeekygen can't get mtime of bro binary %s (try again by specifying the absolute or relative path to Bro): %s", reporter->InternalError("Zeekygen can't get mtime of zeek binary %s (try again by specifying the absolute or relative path to Zeek): %s",
path_to_bro.c_str(), strerror(errno)); path_to_bro.c_str(), strerror(errno));
bro_mtime = s.st_mtime; bro_mtime = s.st_mtime;