From 6e7d5aec3bf0f271efe19fae8591a8556ba52e72 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sun, 20 May 2018 20:14:12 -0700
Subject: [PATCH] ircd::m: Rename room opts to copts for consistency.

---
 include/ircd/m/room.h | 10 +++++-----
 ircd/m/m.cc           |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/ircd/m/room.h b/include/ircd/m/room.h
index e860c4903..c57efe83d 100644
--- a/include/ircd/m/room.h
+++ b/include/ircd/m/room.h
@@ -113,7 +113,7 @@ struct ircd::m::room
 
 	id room_id;
 	event::id event_id;
-	const vm::copts *opts {nullptr};
+	const vm::copts *copts {nullptr};
 	const event::fetch::opts *fopts {nullptr};
 
 	operator const id &() const;
@@ -150,19 +150,19 @@ struct ircd::m::room
 
 	room(const id &room_id,
 	     const string_view &event_id,
-	     const vm::copts *const &opts = nullptr,
+	     const vm::copts *const &copts = nullptr,
 	     const event::fetch::opts *const &fopts = nullptr)
 	:room_id{room_id}
 	,event_id{event_id? event::id{event_id} : event::id{}}
-	,opts{opts}
+	,copts{copts}
 	,fopts{fopts}
 	{}
 
 	room(const id &room_id,
-	     const vm::copts *const &opts = nullptr,
+	     const vm::copts *const &copts = nullptr,
 	     const event::fetch::opts *const &fopts = nullptr)
 	:room_id{room_id}
-	,opts{opts}
+	,copts{copts}
 	,fopts{fopts}
 	{}
 
diff --git a/ircd/m/m.cc b/ircd/m/m.cc
index af92ac760..4d8c6b858 100644
--- a/ircd/m/m.cc
+++ b/ircd/m/m.cc
@@ -483,7 +483,7 @@ ircd::m::vm::eval::operator()(const room &room,
 	// This eval entry point is only used for commits. We try to find the
 	// commit opts the user supplied directly to this eval or with the room.
 	if(!copts)
-		copts = room.opts;
+		copts = room.copts;
 
 	if(!copts)
 		copts = &vm::default_copts;
@@ -2652,7 +2652,9 @@ ircd::m::commit(const room &room,
 {
 	vm::copts opts
 	{
-		room.opts? *room.opts : vm::default_copts
+		room.copts?
+			*room.copts:
+			vm::default_copts
 	};
 
 	// Some functionality on this server may create an event on behalf