Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 01:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove all of the random single-file deprecations

Browse source 
These are the changes that don't require a ton of changes to other files outside
of the original removal.
This commit is contained in:
Tim Wojtulewicz 2021-01-21 11:49:36 -07:00
parent 7e9d89db0a
commit 0618be792f
270 changed files with 36 additions and 4632 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/util.cc
View file

@ -2545,87 +2545,6 @@ string json_escape_utf8(const string& val)
} // namespace zeek::util
// Remove in v4.1.
double& network_time = zeek::run_state::network_time;
unsigned int bro_prng(unsigned int state)
{ return zeek::util::detail::prng(state); }
long int bro_random()
{ return zeek::util::detail::random_number(); }
void bro_srandom(unsigned int seed)
{ zeek::util::detail::seed_random(seed); }
zeek::ODesc* get_escaped_string(zeek::ODesc* d, const char* str, size_t len, bool escape_all)
{ return zeek::util::get_escaped_string(d, str, len, escape_all); }
std::string get_escaped_string(const char* str, size_t len, bool escape_all)
{ return zeek::util::get_escaped_string(str, len, escape_all); }
std::string get_escaped_string(const std::string& str, bool escape_all)
{ return zeek::util::get_escaped_string(str, escape_all); }
std::vector<std::string>* tokenize_string(std::string_view input,
std::string_view delim,
std::vector<std::string>* rval, int limit)
{ return zeek::util::tokenize_string(input, delim, rval, limit); }
std::vector<std::string_view> tokenize_string(std::string_view input, const char delim) noexcept
{ return zeek::util::tokenize_string(input, delim); }
char* skip_whitespace(char* s)
{ return zeek::util::skip_whitespace(s); }
const char* skip_whitespace(const char* s)
{ return zeek::util::skip_whitespace(s); }
char* skip_whitespace(char* s, char* end_of_s)
{ return zeek::util::skip_whitespace(s, end_of_s); }
const char* skip_whitespace(const char* s, const char* end_of_s)
{ return zeek::util::skip_whitespace(s, end_of_s); }
char* get_word(char*& s)
{ return zeek::util::get_word(s); }
void get_word(int length, const char* s, int& pwlen, const char*& pw)
{ zeek::util::get_word(length, s, pwlen, pw); }
void to_upper(char* s)
{ zeek::util::to_upper(s); }
std::string to_upper(const std::string& s)
{ return zeek::util::to_upper(s); }
char* uitoa_n(uint64_t value, char* str, int n, int base, const char* prefix)
{ return zeek::util::uitoa_n(value, str, n, base, prefix); }
int fputs(int len, const char* s, FILE* fp)
{ return zeek::util::fputs(len, s, fp); }
std::string implode_string_vector(const std::vector<std::string>& v,
const std::string& delim)
{ return zeek::util::implode_string_vector(v, delim); }
std::string flatten_script_name(const std::string& name,
const std::string& prefix)
{ return zeek::util::detail::flatten_script_name(name, prefix); }
std::string find_file(const std::string& filename, const std::string& path_set,
const std::string& opt_ext)
{ return zeek::util::find_file(filename, path_set, opt_ext); }
FILE* open_file(const std::string& path, const std::string& mode)
{ return zeek::util::open_file(path, mode); }
FILE* open_package(std::string& path, const std::string& mode)
{ return zeek::util::detail::open_package(path, mode); }
double current_time(bool real)
{ return zeek::util::current_time(real); }
uint64_t calculate_unique_id()
{ return zeek::util::calculate_unique_id(); }
uint64_t calculate_unique_id(const size_t pool)
{ return zeek::util::calculate_unique_id(pool); }
const array<string, 2>& script_extensions = zeek::util::detail::script_extensions;
namespace zeek {
void set_thread_name(const char* name, pthread_t tid)
{ zeek::util::detail::set_thread_name(name, tid); }
} // namespace zeek
extern "C" void out_of_memory(const char* where)
{
fprintf(stderr, "out of memory in %s.\n", where);