Merge remote-tracking branch 'origin/topic/jsiwek/972'

Closes #972.

* origin/topic/jsiwek/972:
  Allow default function/hook/event parameters.  Addresses #972.
This commit is contained in:
Robin Sommer 2013-05-10 19:28:30 -07:00
commit e89e8d7306
17 changed files with 256 additions and 29 deletions

View file

@ -25,7 +25,13 @@ extern const char* builtin_func_arg_type_bro_name[];
class BuiltinFuncArg {
public:
BuiltinFuncArg(const char* arg_name, int arg_type);
BuiltinFuncArg(const char* arg_name, const char* arg_type_str);
BuiltinFuncArg(const char* arg_name, const char* arg_type_str,
const char* arg_attr_str = "");
void SetAttrStr(const char* arg_attr_str)
{
attr_str = arg_attr_str;
};
const char* Name() const { return name; }
int Type() const { return type; }
@ -39,6 +45,7 @@ protected:
const char* name;
int type;
const char* type_str;
const char* attr_str;
};
#endif