Reformat per new coding guidelines.

Change-Id: Ib0e5d3a6fabe6db414d72b334ca7a7f33bc5726b
This commit is contained in:
Peter Johnson
2015-06-25 22:57:43 -07:00
parent f5a82be9e5
commit cee77a3228
26 changed files with 1296 additions and 1576 deletions

View File

@@ -12,56 +12,45 @@
#include "ntcore.h"
bool
operator== (const NT_Value& lhs, const NT_Value& rhs)
{
if (lhs.type != rhs.type)
return false;
switch (lhs.type)
{
bool operator==(const NT_Value& lhs, const NT_Value& rhs) {
if (lhs.type != rhs.type) return false;
switch (lhs.type) {
case NT_UNASSIGNED:
return true; // XXX: is this better being false instead?
return true; // XXX: is this better being false instead?
case NT_BOOLEAN:
return lhs.data.v_boolean == rhs.data.v_boolean;
return lhs.data.v_boolean == rhs.data.v_boolean;
case NT_DOUBLE:
return lhs.data.v_double == rhs.data.v_double;
return lhs.data.v_double == rhs.data.v_double;
case NT_STRING:
case NT_RAW:
case NT_RPC:
if (lhs.data.v_string.len != rhs.data.v_string.len)
return false;
return std::memcmp(lhs.data.v_string.str, rhs.data.v_string.str,
lhs.data.v_string.len) == 0;
if (lhs.data.v_string.len != rhs.data.v_string.len) return false;
return std::memcmp(lhs.data.v_string.str, rhs.data.v_string.str,
lhs.data.v_string.len) == 0;
case NT_BOOLEAN_ARRAY:
if (lhs.data.arr_boolean.size != rhs.data.arr_boolean.size)
return false;
return std::memcmp(lhs.data.arr_boolean.arr, rhs.data.arr_boolean.arr,
lhs.data.arr_boolean.size *
sizeof(lhs.data.arr_boolean.arr[0])) == 0;
if (lhs.data.arr_boolean.size != rhs.data.arr_boolean.size) return false;
return std::memcmp(lhs.data.arr_boolean.arr, rhs.data.arr_boolean.arr,
lhs.data.arr_boolean.size *
sizeof(lhs.data.arr_boolean.arr[0])) == 0;
case NT_DOUBLE_ARRAY:
if (lhs.data.arr_double.size != rhs.data.arr_double.size)
return false;
return std::memcmp(lhs.data.arr_double.arr, rhs.data.arr_double.arr,
lhs.data.arr_double.size *
sizeof(lhs.data.arr_double.arr[0])) == 0;
case NT_STRING_ARRAY:
{
if (lhs.data.arr_string.size != rhs.data.arr_string.size)
return false;
for (size_t i=0; i<lhs.data.arr_string.size; i++)
{
if (lhs.data.arr_string.arr[i].len !=
rhs.data.arr_string.arr[i].len)
return false;
if (std::memcmp(lhs.data.arr_string.arr[i].str,
rhs.data.arr_string.arr[i].str,
lhs.data.arr_string.arr[i].len) != 0)
return false;
}
return true;
if (lhs.data.arr_double.size != rhs.data.arr_double.size) return false;
return std::memcmp(lhs.data.arr_double.arr, rhs.data.arr_double.arr,
lhs.data.arr_double.size *
sizeof(lhs.data.arr_double.arr[0])) == 0;
case NT_STRING_ARRAY: {
if (lhs.data.arr_string.size != rhs.data.arr_string.size) return false;
for (size_t i = 0; i < lhs.data.arr_string.size; i++) {
if (lhs.data.arr_string.arr[i].len != rhs.data.arr_string.arr[i].len)
return false;
if (std::memcmp(lhs.data.arr_string.arr[i].str,
rhs.data.arr_string.arr[i].str,
lhs.data.arr_string.arr[i].len) != 0)
return false;
}
return true;
}
default:
//assert(false && "unknown value type");
return false;
}
// assert(false && "unknown value type");
return false;
}
}