Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 15:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace deprecated usage of BifFunc:: with zeek::BifFunc::

Browse source 
Names of functions also changed slightly, like bro_fmt -> fmt_bif.

Should generally be unusual/unexpected to see somone calling these
directly from C++ in their plugin, but since technically possible in
previous versions, I also removed the "private" restriction on accessing
the BifReturnVal member.
This commit is contained in:
Jon Siwek 2020-05-14 14:21:30 -07:00
parent 0db5c920f2
commit ca1e5fe4be
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aux/bifcl

@ -1 +1 @@
Subproject commit 7fdbbfdf5ee3669a77f73360b86326344e15ea99 Subproject commit 2d56fd7e6d59aab754176b3ec90e71600d22d713

2
src/Func.cc
View file

@ -781,7 +781,7 @@ void init_builtin_funcs_subdirs()
bool check_built_in_call(BuiltinFunc* f, CallExpr* call) bool check_built_in_call(BuiltinFunc* f, CallExpr* call)
{ {
if ( f->TheFunc() != BifFunc::bro_fmt ) if ( f->TheFunc() != zeek::BifFunc::fmt_bif)
return true; return true;
const expr_list& args = call->Args()->Exprs(); const expr_list& args = call->Args()->Exprs();

4
src/Func.h
View file

@ -206,10 +206,6 @@ public:
[[deprecated("Remove in v4.1. Return an IntrusivePtr instead.")]] [[deprecated("Remove in v4.1. Return an IntrusivePtr instead.")]]
BifReturnVal(Val* v) noexcept; BifReturnVal(Val* v) noexcept;
private:
friend class BuiltinFunc;
IntrusivePtr<Val> rval; IntrusivePtr<Val> rval;
}; };

8
src/Hash.h
View file

@ -30,9 +30,9 @@ class BroString;
class Val; class Val;
class Frame; class Frame;
class BifReturnVal; class BifReturnVal;
namespace BifFunc { namespace zeek { namespace BifFunc {
extern BifReturnVal bro_md5_hmac(Frame* frame, const zeek::Args*); extern BifReturnVal md5_hmac_bif(Frame* frame, const zeek::Args*);
} }}
typedef uint64_t hash_t; typedef uint64_t hash_t;
typedef uint64_t hash64_t; typedef uint64_t hash64_t;
@ -196,7 +196,7 @@ private:
inline static bool seeds_initialized = false; inline static bool seeds_initialized = false;
friend void hmac_md5(size_t size, const unsigned char* bytes, unsigned char digest[16]); friend void hmac_md5(size_t size, const unsigned char* bytes, unsigned char digest[16]);
friend BifReturnVal BifFunc::bro_md5_hmac(Frame* frame, const zeek::Args*); friend BifReturnVal zeek::BifFunc::md5_hmac_bif(Frame* frame, const zeek::Args*);
}; };
typedef enum { typedef enum {