From 6aa1d0468d7c33f68ad75180d00fd0f6e6f20451 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Fri, 15 May 2020 18:25:45 -0700
Subject: [PATCH] Deprecate BroFile::FType(), replace with GetType()

---
 src/File.h | 4 ++++
 src/Val.cc | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/File.h b/src/File.h
index 212e301afb..edf0b7d0f4 100644
--- a/src/File.h
+++ b/src/File.h
@@ -37,8 +37,12 @@ public:
 
 	void SetBuf(bool buffered);	// false=line buffered, true=fully buffered
 
+	[[deprecated("Remove in v4.1.  Use GetType().")]]
 	BroType* FType() const	{ return t.get(); }
 
+	const IntrusivePtr<BroType>& GetType() const
+		{ return t; }
+
 	// Whether the file is open in a general sense; it might
 	// not be open as a Unix file due to our management of
 	// a finite number of FDs.
diff --git a/src/Val.cc b/src/Val.cc
index 533f433989..5c8265b405 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -63,7 +63,7 @@ Val::Val(BroFile* f) : Val({AdoptRef{}, f})
 Val::Val(IntrusivePtr<BroFile> f)
 	: val(f.release()), type(GetStringFileType())
 	{
-	assert(val.file_val->FType()->Tag() == TYPE_STRING);
+	assert(val.file_val->GetType()->Tag() == TYPE_STRING);
 	}
 
 Val::~Val()