inline constexpr in protocol

+ fix warnings, and add noexcept

Author: mrotteveel

src/remote/protocol.cpp

@@ -69,29 +69,29 @@ inline void DEBUG_XDR_FREE(RemoteXdr* xdrs, const void* xdrvar, const void* addr
 	xdr_debug_memory(xdrs, XDR_DECODE, xdrvar, addr, len);
 }
 #else
-inline bool_t P_TRUE(RemoteXdr*, PACKET*)
+inline bool_t P_TRUE(RemoteXdr*, PACKET*) noexcept
 {
 	return TRUE;
 }
-inline bool_t P_FALSE(RemoteXdr* xdrs, PACKET*)
+inline bool_t P_FALSE(RemoteXdr* xdrs, PACKET*) noexcept
 {
 	return FALSE;
 }
-inline void DEBUG_XDR_PACKET(RemoteXdr*, PACKET*)
+inline void DEBUG_XDR_PACKET(RemoteXdr*, PACKET*) noexcept
 {
 }
-inline void DEBUG_XDR_ALLOC(RemoteXdr*, const void*, const void*, ULONG)
+inline void DEBUG_XDR_ALLOC(RemoteXdr*, const void*, const void*, ULONG) noexcept
 {
 }
-inline void DEBUG_XDR_FREE(RemoteXdr*, const void*, const void*, ULONG)
+inline void DEBUG_XDR_FREE(RemoteXdr*, const void*, const void*, ULONG) noexcept
 {
 }
 #endif // DEBUG_XDR_MEMORY
 
 #define P_CHECK(xdr, p, st) if (st.getState() & IStatus::STATE_ERRORS) return P_FALSE(xdr, p)
 
 #define MAP(routine, ptr)	if (!routine (xdrs, &ptr)) return P_FALSE(xdrs, p);
-const ULONG MAX_OPAQUE		= 32768;
+constexpr ULONG MAX_OPAQUE = 32768;
 
 enum SQL_STMT_TYPE
 {
@@ -125,22 +125,22 @@ static Rsr* getStatement(RemoteXdr*, USHORT);
 static Rtr* getTransaction(RemoteXdr*, USHORT);
 
 
-inline void fixupLength(const RemoteXdr* xdrs, ULONG& length)
+inline void fixupLength(const RemoteXdr* xdrs, ULONG& length) noexcept
 {
 	// If the short (16-bit) value >= 32KB is being transmitted,
 	// it gets expanded to long (32-bit) with a sign bit propagated.
 	// In order to avoid troubles when reading such a value as long,
 	// let's detect and fix unexpected overflows. Here we assume
 	// that real longs will never have the highest 16 bits set.
 
-	if (xdrs->x_op == XDR_DECODE && length >> 16 == (ULONG) 0xFFFF)
-		length &= (ULONG) 0xFFFF;
+	if (xdrs->x_op == XDR_DECODE && length >> 16 == ULONG{ 0xFFFF })
+		length &= ULONG{ 0xFFFF };
 }
 
 
 #ifdef DEBUG
 static ULONG xdr_save_size = 0;
-inline void DEBUG_PRINTSIZE(RemoteXdr* xdrs, P_OP p)
+inline void DEBUG_PRINTSIZE(RemoteXdr* xdrs, P_OP p) noexcept
 {
 	fprintf (stderr, "xdr_protocol: %s op %d size %lu\n",
 		((xdrs->x_op == XDR_FREE)   ? "free" :
@@ -150,7 +150,7 @@ inline void DEBUG_PRINTSIZE(RemoteXdr* xdrs, P_OP p)
 			(xdrs->x_handy - xdr_save_size) : (xdr_save_size - xdrs->x_handy)));
 }
 #else
-inline void DEBUG_PRINTSIZE(RemoteXdr*, P_OP)
+inline void DEBUG_PRINTSIZE(RemoteXdr*, P_OP) noexcept
 {
 }
 #endif
@@ -467,7 +467,7 @@ bool_t xdr_protocol(RemoteXdr* xdrs, PACKET* p)
 	case op_create_blob2:
 		blob = &p->p_blob;
 		MAP(xdr_cstring_const, blob->p_blob_bpb);
-		// fall into:
+		[[fallthrough]];
 
 	case op_open_blob:
 	case op_create_blob:
@@ -702,7 +702,7 @@ bool_t xdr_protocol(RemoteXdr* xdrs, PACKET* p)
 		if (port->port_protocol >= PROTOCOL_INLINE_BLOB)
 			MAP(xdr_u_long, prep_stmt->p_sqlst_inline_blob_size);
 
-		// Fall into ...
+		[[fallthrough]];
 
 	case op_exec_immediate:
 	case op_prepare_statement:
@@ -882,7 +882,7 @@ bool_t xdr_protocol(RemoteXdr* xdrs, PACKET* p)
 				return P_TRUE(xdrs, p);
 			}
 
-			SSHORT statement_id = b->p_batch_statement;
+			const SSHORT statement_id = b->p_batch_statement;
 			Rsr* statement;
 			if (statement_id >= 0)
 			{
@@ -960,7 +960,7 @@ bool_t xdr_protocol(RemoteXdr* xdrs, PACKET* p)
 			if (xdrs->x_op == XDR_FREE)
 				return P_TRUE(xdrs, p);
 
-			SSHORT statement_id = b->p_batch_statement;
+			const SSHORT statement_id = b->p_batch_statement;
 			DEB_RBATCH(fprintf(stderr, "BatRem: xdr CS %d\n", statement_id));
 			Rsr* statement;
 
@@ -1195,17 +1195,14 @@ static bool_t xdr_bytes(RemoteXdr* xdrs, void* bytes, ULONG size)
 	switch (xdrs->x_op)
 	{
 	case XDR_ENCODE:
-		if (!xdrs->x_putbytes(reinterpret_cast<const SCHAR*>(bytes), size))
-			return FALSE;
-		break;
+		return xdrs->x_putbytes(static_cast<const SCHAR*>(bytes), size);
 
 	case XDR_DECODE:
-		if (!xdrs->x_getbytes(reinterpret_cast<SCHAR*>(bytes), size))
-			return FALSE;
-		break;
-	}
+		return xdrs->x_getbytes(static_cast<SCHAR*>(bytes), size);
 
-	return TRUE;
+	default:
+		return TRUE;
+	}
 }
 
 
@@ -1338,7 +1335,7 @@ void CSTRING::free(RemoteXdr* xdrs)
 }
 
 
-static bool xdr_is_client(RemoteXdr* xdrs)
+static bool xdr_is_client(RemoteXdr* xdrs) noexcept
 {
 	const rem_port* port = xdrs->x_public;
 	return !(port->port_flags & PORT_server);
@@ -1376,7 +1373,7 @@ static inline bool_t xdr_response(RemoteXdr* xdrs, CSTRING* cstring)
 {
 	if (xdr_is_client(xdrs) && xdrs->x_op == XDR_DECODE && cstring->cstr_allocated)
 	{
-		ULONG limit = cstring->cstr_allocated;
+		const ULONG limit = cstring->cstr_allocated;
 		cstring->cstr_allocated = 0;
 		return xdr_cstring_with_limit(xdrs, cstring, limit);
 	}
@@ -1641,17 +1638,17 @@ static bool_t xdr_packed_message( RemoteXdr* xdrs, RMessage* message, const rem_
 			resize(size);
 		}
 
-		void setNull(USHORT id)
+		void setNull(USHORT id) noexcept
 		{
 			data[id >> 3] |= (1 << (id & 7));
 		}
 
-		bool isNull(USHORT id) const
+		bool isNull(USHORT id) const noexcept
 		{
 			return data[id >> 3] & (1 << (id & 7));
 		}
 
-		UCHAR* getData()
+		UCHAR* getData() noexcept
 		{
 			return data;
 		}
@@ -2355,37 +2352,37 @@ static bool_t xdr_blob_stream(RemoteXdr* xdrs, SSHORT statement_id, CSTRING* str
 		ULONG& bpbSize;
 		ULONG& segSize;
 
-		BlobFlow(Rsr::BatchStream* bs)
+		BlobFlow(Rsr::BatchStream* bs) noexcept
 			: remains(0), streamPtr(NULL),
 			  blobSize(bs->blobRemaining), bpbSize(bs->bpbRemaining), segSize(bs->segRemaining)
 		{ }
 
-		void newBlob(ULONG totalSize, ULONG parSize)
+		void newBlob(ULONG totalSize, ULONG parSize) noexcept
 		{
 			blobSize = totalSize;
 			bpbSize = parSize;
 			segSize = 0;
 		}
 
-		void move(ULONG step)
+		void move(ULONG step) noexcept
 		{
 			move2(step);
 			blobSize -= step;
 		}
 
-		void moveBpb(ULONG step)
+		void moveBpb(ULONG step) noexcept
 		{
 			move(step);
 			bpbSize -= step;
 		}
 
-		void moveSeg(ULONG step)
+		void moveSeg(ULONG step) noexcept
 		{
 			move(step);
 			segSize -= step;
 		}
 
-		bool align(ULONG alignment)
+		bool align(ULONG alignment) noexcept
 		{
 			ULONG a = IPTR(streamPtr) % alignment;
 			if (a)
@@ -2399,7 +2396,7 @@ static bool_t xdr_blob_stream(RemoteXdr* xdrs, SSHORT statement_id, CSTRING* str
 		}
 
 private:
-		void move2(ULONG step)
+		void move2(ULONG step) noexcept
 		{
 			streamPtr += step;
 			remains -= step;
@@ -2491,7 +2488,7 @@ static bool_t xdr_blob_stream(RemoteXdr* xdrs, SSHORT statement_id, CSTRING* str
 		// process BPB
 		if (flow.bpbSize)
 		{
-			ULONG size = MIN(flow.bpbSize, flow.remains);
+			const ULONG size = std::min(flow.bpbSize, flow.remains);
 			if (!xdr_bytes(xdrs, flow.streamPtr, size))
 				return FALSE;
 			localStrm.curBpb.add(flow.streamPtr, size);