mapi_lib: delete old usercvt functions

Author: jengelh

include/gromox/usercvt.hpp

@@ -13,9 +13,7 @@ namespace gromox {
 
 using cvt_id2user = ec_error_t (*)(unsigned int, std::string &);
 extern GX_EXPORT ec_error_t cvt_essdn_to_username(const char *emaddr, const char *org, cvt_id2user, std::string &);
-extern GX_EXPORT ec_error_t cvt_essdn_to_username(const char *emaddr, const char *org, cvt_id2user, char *, size_t);
 extern GX_EXPORT ec_error_t cvt_genaddr_to_smtpaddr(const char *atype, const char *emaddr, const char *org, cvt_id2user, std::string &);
-extern GX_EXPORT ec_error_t cvt_genaddr_to_smtpaddr(const char *atype, const char *emaddr, const char *org, cvt_id2user, char *, size_t);
 /* Only muidEMSAB entryids */
 extern GX_EXPORT ec_error_t cvt_emsab_to_essdn(const BINARY *, std::string &);
 /* Multiple types of entryids */

lib/mapi/oxcical.cpp

@@ -3115,7 +3115,7 @@ static bool oxcical_export_rdate(const char *tzid, bool b_date,
 static void oxcical_export_organizer(const MESSAGE_CONTENT &msg,
     ical_component &com, const char *org_name, cvt_id2user id2user)
 {
-	char buf[UADDR_SIZE];
+	std::string buf;
 	auto str = msg.proplist.get<char>(PR_SENT_REPRESENTING_SMTP_ADDRESS);
 	if (str != nullptr) {
 		str = msg.proplist.get<char>(PR_SENT_REPRESENTING_ADDRTYPE);
@@ -3127,16 +3127,14 @@ static void oxcical_export_organizer(const MESSAGE_CONTENT &msg,
 			str = msg.proplist.get<char>(PR_SENT_REPRESENTING_EMAIL_ADDRESS);
 			if (str != nullptr) {
 				auto ret = cvt_essdn_to_username(str, org_name,
-				           std::move(id2user), buf, std::size(buf));
-				str = ret == ecSuccess ? buf : nullptr;
+				           std::move(id2user), buf);
+				str = ret == ecSuccess ? buf.c_str() : nullptr;
 			}
 		}
 	}
 	if (str == nullptr)
 		return;
-	char buf1[UADDR_SIZE+10];
-	snprintf(buf1, std::size(buf1), "MAILTO:%s", str);
-	auto line = &com.append_line("ORGANIZER", buf1);
+	auto line = &com.append_line("ORGANIZER", "MAILTO:"s + str);
 	str = msg.proplist.get<char>(PR_SENT_REPRESENTING_NAME);
 	if (str != nullptr)
 		line->append_param("CN", str);

lib/mapi/usercvt.cpp

@@ -49,16 +49,6 @@ ec_error_t cvt_essdn_to_username(const char *idn, const char *org,
 	return ecServerOOM;
 }
 
-ec_error_t cvt_essdn_to_username(const char *idn, const char *org,
-    cvt_id2user id2user, char *username, size_t ulen)
-{
-	std::string es_result;
-	auto ret = cvt_essdn_to_username(idn, org, std::move(id2user), es_result);
-	if (ret == ecSuccess)
-		gx_strlcpy(username, es_result.c_str(), ulen);
-	return ret;
-}
-
 /**
  * ecNullObject is returned to signify that a situation was encountered that is
  * equivalent to addrtype not having been present in the first place.
@@ -93,17 +83,6 @@ ec_error_t cvt_genaddr_to_smtpaddr(const char *addrtype, const char *emaddr,
 	return ecUnknownUser;
 }
 
-ec_error_t cvt_genaddr_to_smtpaddr(const char *addrtype, const char *emaddr,
-    const char *org, cvt_id2user id2user, char *smtpaddr, size_t slen)
-{
-	std::string es_result;
-	auto ret = cvt_genaddr_to_smtpaddr(addrtype, emaddr, org,
-	           std::move(id2user), es_result);
-	if (ret == ecSuccess)
-		gx_strlcpy(smtpaddr, es_result.c_str(), slen);
-	return ret;
-}
-
 static ec_error_t emsab_to_email2(EXT_PULL &ser, const char *org, cvt_id2user id2user,
     std::string &smtpaddr)
 {