From 8fdaf61ef1969e1944f848324d0db82d6d06f1bc Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Mon, 13 Jul 2015 22:45:35 -0700 Subject: [PATCH] Use typedef for GetEntryFunc function pointer. Change-Id: I58d4be7783656eb712cb32cd17075b4f35886693 --- src/Message.cpp | 4 ++-- src/Message.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Message.cpp b/src/Message.cpp index 07faeff0b1..8ea63e600b 100644 --- a/src/Message.cpp +++ b/src/Message.cpp @@ -14,8 +14,8 @@ static constexpr unsigned long kClearAllMagic = 0xD06CB27Aul; using namespace ntimpl; -bool Message::Read(WireDecoder& decoder, - NT_Type (*get_entry_type)(unsigned int id), Message* msg) { +bool Message::Read(WireDecoder& decoder, GetEntryTypeFunc get_entry_type, + Message* msg) { unsigned int msg_type; if (!decoder.Read8(&msg_type)) return false; *msg = Message(static_cast(msg_type)); diff --git a/src/Message.h b/src/Message.h index ef70b6b377..28d326a31a 100644 --- a/src/Message.h +++ b/src/Message.h @@ -35,6 +35,7 @@ class Message { kExecuteRpc = 0x20, kRpcResponse = 0x21 }; + typedef NT_Type (*GetEntryTypeFunc)(unsigned int id); Message() : m_type(kUnknown), m_id(0), m_flags(0), m_seq_num_uid(0) {} @@ -43,8 +44,8 @@ class Message { // Read and write from wire representation void Write(WireEncoder& encoder) const; - static bool Read(WireDecoder& decoder, - NT_Type (*get_entry_type)(unsigned int id), Message* msg); + static bool Read(WireDecoder& decoder, GetEntryTypeFunc get_entry_type, + Message* msg); // Create messages without data static Message KeepAlive() { return Message(kKeepAlive); }