From 0dbbee46ae47b46bb724b151471ca11c09581fd7 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Mon, 7 Feb 2011 14:46:28 -0800 Subject: [PATCH 1/2] Teaching bifcl to accept scoped IDs. --- src/builtin-func.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/builtin-func.l b/src/builtin-func.l index ca7923b852..a9459ea4a8 100644 --- a/src/builtin-func.l +++ b/src/builtin-func.l @@ -27,7 +27,7 @@ int check_c_mode(int t) %} WS [ \t]+ -ID [A-Za-z_][A-Za-z_0-9]* +ID [A-Za-z_](([A-Za-z_0-9]|::)*[A-Za-z_0-9])? ESCSEQ (\\([^\n]|[0-7]+|x[[:xdigit:]]+)) %option nodefault From f43766650f730b9f03bbc800e88066b8197c70a2 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Mon, 7 Feb 2011 14:46:49 -0800 Subject: [PATCH 2/2] Fixing hashing records with optional strings. --- src/CompHash.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CompHash.cc b/src/CompHash.cc index cc4f440e06..2f1a41e311 100644 --- a/src/CompHash.cc +++ b/src/CompHash.cc @@ -407,7 +407,7 @@ int CompositeHash::SingleTypeKeySize(BroType* bt, const Val* v, case TYPE_INTERNAL_STRING: if ( ! v ) - return 0; + return optional ? sz : 0; // Factor in length field. sz = SizeAlign(sz, sizeof(int));