lib: use more ec_error_t

Author: jengelh

include/gromox/defs.h

@@ -84,7 +84,7 @@ enum cpid_t : uint32_t {
 };
 
 extern GX_EXPORT const char *mapi_errname_r(unsigned int, char *, size_t);
-extern GX_EXPORT const char *mapi_strerror(unsigned int);
+extern GX_EXPORT const char *mapi_strerror(ec_error_t);
 
 template<typename T> constexpr T *deconst(const T *x) { return const_cast<T *>(x); }
 #undef roundup /* you naughty glibc */

lib/exmdb_ext.cpp

@@ -2571,7 +2571,7 @@ static pack_result exmdb_pull(EXT_PULL &x, exresp_get_mapping_replid &d)
 static pack_result exmdb_push(EXT_PUSH &x, const exresp_get_mapping_replid &d)
 {
 	TRY(x.p_uint16(d.replid));
-	return x.p_uint32(d.e_result);
+	return x.p_err32(d.e_result);
 }
 
 static pack_result exmdb_pull(EXT_PULL &x, exresp_get_store_all_proptags &d)
@@ -3225,7 +3225,7 @@ static pack_result exmdb_pull(EXT_PULL &x, exresp_error &d)
 
 static pack_result exmdb_push(EXT_PUSH &x, const exresp_error &d)
 {
-	return x.p_uint32(d.e_result);
+	return x.p_err32(d.e_result);
 }
 
 static pack_result exmdb_pull(EXT_PULL &x, exresp_get_instance_all_proptags &d)

lib/rfbl.cpp

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-// SPDX-FileCopyrightText: 2021-2024 grommunio GmbH
+// SPDX-FileCopyrightText: 2021-2025 grommunio GmbH
 // This file is part of Gromox.
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -191,11 +191,11 @@ const char *mapi_errname_r(unsigned int e, char *b, size_t bz)
 	return b;
 }
 
-const char *mapi_strerror(unsigned int e)
+const char *mapi_strerror(ec_error_t e)
 {
 	// STG = storage
-#define E(v, s) case v: return s;
 	switch (e) {
+#define E(v, s) case v: return s;
 	E(ecSuccess, "The operation succeeded")
 	E(ecUnknownUser, "User is unknown to the system")
 	E(ecServerOOM, "Server could not allocate memory")
@@ -278,7 +278,7 @@ const char *mapi_strerror(unsigned int e)
 	E(ecZOutOfHandles, "Too many object handles open")
 	default: {
 		thread_local char xbuf[40];
-		snprintf(xbuf, sizeof(xbuf), "Unknown MAPI error code %xh", e);
+		snprintf(xbuf, sizeof(xbuf), "Unknown MAPI error code %xh", static_cast<uint32_t>(e));
 		return xbuf;
 	}
 	}

lib/ruleproc.cpp

@@ -800,7 +800,9 @@ static ec_error_t op_switch(rxparam &par, const rule_node &rule,
 	case OP_MOVE:
 	case OP_COPY: {
 		auto mc = static_cast<MOVECOPY_ACTION *>(act.pdata);
-		return mc != nullptr ? op_copy(par, rule, *mc, act.type) : ecSuccess;
+		if (mc == nullptr)
+			return ecSuccess;
+		return op_copy(par, rule, *mc, act.type);
 	}
 	case OP_MARK_AS_READ:
 		return op_read(par, rule);

tools/eml2mt.cpp

@@ -245,7 +245,8 @@ static errno_t do_vcard(const char *file, std::vector<message_ptr> &mv)
 	std::vector<vcard> cardvec;
 	auto ret = vcard_load_multi_from_str_move(slurp_data.get(), cardvec);
 	if (ret != ecSuccess) {
-		fprintf(stderr, "vcard_parse %s unsuccessful (ecode=%xh)\n", file, ret);
+		fprintf(stderr, "vcard_parse %s unsuccessful (ecode=%xh)\n",
+			file, static_cast<unsigned int>(ret));
 		return EIO;
 	}
 	for (const auto &card : cardvec) {