mapi_lib: replace GUID::compare with GUID::operator<=>

Author: jengelh

exch/ews/structures.cpp

@@ -2787,7 +2787,7 @@ tExtendedFieldURI::tExtendedFieldURI(uint16_t type, const PROPERTY_NAME& propnam
 		PropertyName = propname.pname;
 
 	auto it = std::find_if(std::begin(propsetIds), std::end(propsetIds),
-	                       [&](const auto& propsetId){ return propsetId->compare(propname.guid) == 0; });
+	                       [&](const auto &propsetId) { return *propsetId == propname.guid; });
 	if (it != std::end(propsetIds))
 		DistinguishedPropertySetId = Enum::DistinguishedPropertySetType(static_cast<uint8_t>(std::distance(std::begin(propsetIds), it)));
 }

include/gromox/mapidefs.h

@@ -983,7 +983,6 @@ struct GX_EXPORT GUID {
 	void to_str(char *, size_t, unsigned int type = 36) const;
 	bool from_str(const char *);
 	int compare_4_12(const GUID &) const;
-	int compare(const GUID &) const;
 	static GUID random_new();
 	static const GUID &machine_id();
 
@@ -993,9 +992,17 @@ struct GX_EXPORT GUID {
 	uint8_t clock_seq[2];
 	uint8_t node[6];
 
-	/* Same considerations as for FLATUID */
+	/*
+	 * Same considerations as for FLATUID: because of bad gcc optimization,
+	 * call memcmp directly.
+	 */
 	inline bool operator==(const GUID &o) const { return memcmp(this, &o, sizeof(o)) == 0; }
 	inline bool operator!=(const GUID &o) const { return !operator==(o); }
+	/*
+	 * EXC2019 evaluates GUID-GUID comparisons (in e.g. restrictions)
+	 * member-wise and in host order.
+	 */
+	inline auto operator<=>(const GUID &) const = default;
 };
 
 struct GX_EXPORT GUID_ARRAY {

lib/guid2.cpp

@@ -353,15 +353,3 @@ int GUID::compare_4_12(const GUID &o) const
 	auto r = memcmp(clock_seq, o.clock_seq, std::size(clock_seq));
 	return r != 0 ? r : memcmp(node, o.node, std::size(node));
 }
-
-int GUID::compare(const GUID &o) const
-{
-	/*
-	 * EXC2019 also evaluates restrictions (should be the same as the
-	 * outcome of a sort operation) such that GUID fields are compared in
-	 * broken-out fashion, host-order.
-	 */
-	if (time_low != o.time_low)
-		return time_low > o.time_low ? 1 : -1;
-	return compare_4_12(o);
-}

lib/mapi/propval.cpp

@@ -602,8 +602,10 @@ int propval_compare(const void *pvalue1, const void *pvalue2, proptype_t proptyp
 	case PT_GXI_STRING:
 		return strcasecmp(static_cast<const char *>(pvalue1),
 		       static_cast<const char *>(pvalue2));
-	case PT_CLSID:
-		return static_cast<const GUID *>(pvalue1)->compare(*static_cast<const GUID *>(pvalue2));
+	case PT_CLSID: {
+		auto c = *static_cast<const GUID *>(pvalue1) <=> *static_cast<const GUID *>(pvalue2);
+		return c == 0 ? 0 : c < 0 ? -1 : 1;
+	}
 	case PT_BINARY: {
 		auto c = *static_cast<const BINARY *>(pvalue1) <=> *static_cast<const BINARY *>(pvalue2);
 		return c == 0 ? 0 : c < 0 ? -1 : 1;
@@ -680,9 +682,9 @@ int propval_compare(const void *pvalue1, const void *pvalue2, proptype_t proptyp
 		if (cmp != 0)
 			break;
 		for (size_t i = 0; i < bv1->count; ++i) {
-			cmp = bv1->pguid[i].compare(bv2->pguid[i]);
-			if (cmp != 0)
-				break;
+			auto c = bv1->pguid[i] <=> bv2->pguid[i];
+			if (c != 0)
+				return c < 0 ? -1 : 1;
 		}
 		break;
 	}

tests/utiltest.cpp

@@ -307,7 +307,11 @@ static int t_cmp_binary()
 static int t_cmp_guid()
 {
 	GUID g1 = {0x01}, g2 = {0x0100};
-	assert(g1.compare(g2) < 0);
+	assert(g1 < g2);
+	assert(g2 > g1);
+	assert(g1 == g1);
+	assert(g2 == g2);
+	assert(g1 != g2);
 
 	char buf[sizeof(FLATUID)];
 	EXT_PUSH ep;