From c306fcf3d750fdba209e84f5055b5a0bd7764bd9 Mon Sep 17 00:00:00 2001
From: Johanna Amann <johanna@corelight.com>
Date: Thu, 23 Jan 2020 12:15:38 -0800
Subject: [PATCH] Make bro_broker::val_to_data take a const Val* instead of a
 Val

---
 src/broker/Data.cc | 8 ++++----
 src/broker/Data.h  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/broker/Data.cc b/src/broker/Data.cc
index 0929961dc8..56414e9c1a 100644
--- a/src/broker/Data.cc
+++ b/src/broker/Data.cc
@@ -791,7 +791,7 @@ IntrusivePtr<Val> bro_broker::data_to_val(broker::data d, BroType* type)
 	return {caf::visit(val_converter{type}, std::move(d)), false};
 	}
 
-broker::expected<broker::data> bro_broker::val_to_data(Val* v)
+broker::expected<broker::data> bro_broker::val_to_data(const Val* v)
 	{
 	switch ( v->Type()->Tag() ) {
 	case TYPE_BOOL:
@@ -856,7 +856,7 @@ broker::expected<broker::data> bro_broker::val_to_data(Val* v)
 		return {string(v->AsFile()->Name())};
 	case TYPE_FUNC:
 		{
-		Func* f = v->AsFunc();
+		const Func* f = v->AsFunc();
 		std::string name(f->Name());
 
 		broker::vector rval;
@@ -865,7 +865,7 @@ broker::expected<broker::data> bro_broker::val_to_data(Val* v)
 		if ( name.find("lambda_<") == 0 )
 			{
 			// Only BroFuncs have closures.
-			if ( auto b = dynamic_cast<BroFunc*>(f) )
+			if ( auto b = dynamic_cast<const BroFunc*>(f) )
 				{
 				auto bc = b->SerializeClosure();
 				if ( ! bc )
@@ -1006,7 +1006,7 @@ broker::expected<broker::data> bro_broker::val_to_data(Val* v)
 		}
 	case TYPE_PATTERN:
 		{
-		RE_Matcher* p = v->AsPattern();
+		const RE_Matcher* p = v->AsPattern();
 		broker::vector rval = {p->PatternText(), p->AnywherePatternText()};
 		return {std::move(rval)};
 		}
diff --git a/src/broker/Data.h b/src/broker/Data.h
index fa7ca89400..83227896d1 100644
--- a/src/broker/Data.h
+++ b/src/broker/Data.h
@@ -50,7 +50,7 @@ EnumVal* get_data_type(RecordVal* v, Frame* frame);
  * @param v a Bro value.
  * @return a Broker data value if the Bro value could be converted to one.
  */
-broker::expected<broker::data> val_to_data(Val* v);
+broker::expected<broker::data> val_to_data(const Val* v);
 
 /**
  * Convert a Broker data value to a Bro value.