Skip to content

Commit 4d613fc

Browse files
committed
emsmdb: use 1-argument form of bin2hex
1 parent d772102 commit 4d613fc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

exch/emsmdb/emsmdb_interface.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void emsmdb_report()
123123
auto &ei = h.info;
124124
auto pn = double_list_get_nodes_num(&h.notify_list);
125125
mlog(LV_INFO, "%-32s %-32s /%-2u %-4u %-4u %3zu",
126-
bin2hex(&h.guid, sizeof(GUID)).c_str(), h.username, h.cxr,
126+
bin2hex(h.guid).c_str(), h.username, h.cxr,
127127
ei.cpid, ei.lcid_string, pn);
128128
++sessions;
129129
pend_notif += pn;
@@ -139,7 +139,7 @@ void emsmdb_report()
139139
++logons;
140140
auto lo = static_cast<logon_object *>(root->pobject);
141141
mlog(LV_INFO, "%5u %-32s %s(%u/%u)", i,
142-
bin2hex(&lo->mailbox_guid, sizeof(lo->mailbox_guid)).c_str(),
142+
bin2hex(lo->mailbox_guid).c_str(),
143143
lo->account, lo->account_id, lo->domain_id);
144144
}
145145
}

exch/emsmdb/oxcfxics.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,7 @@ ec_error_t rop_syncimportdeletes(uint8_t flags, const TPROPVAL_ARRAY *ppropvals,
13151315
auto tmp_guid = rop_util_make_user_guid(plogon->account_id);
13161316
if (tmp_guid != tmp_xid.guid) {
13171317
mlog(LV_WARN, "W-2152: importdeletes expected store %s but got store+XID %s",
1318-
bin2hex(&tmp_guid, sizeof(tmp_guid)).c_str(),
1318+
bin2hex(tmp_guid).c_str(),
13191319
bin2hex(&tmp_xid, tmp_xid.size).c_str());
13201320
return ecInvalidParam;
13211321
}
@@ -1324,7 +1324,7 @@ ec_error_t rop_syncimportdeletes(uint8_t flags, const TPROPVAL_ARRAY *ppropvals,
13241324
auto tmp_guid = rop_util_make_domain_guid(plogon->account_id);
13251325
if (tmp_guid != tmp_xid.guid) {
13261326
mlog(LV_WARN, "W-2153: importdeletes expected store %s but got store+XID %s",
1327-
bin2hex(&tmp_guid, sizeof(tmp_guid)).c_str(),
1327+
bin2hex(tmp_guid).c_str(),
13281328
bin2hex(&tmp_xid, tmp_xid.size).c_str());
13291329
return ecInvalidParam;
13301330
}

lib/mapi/oxvcard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ BOOL oxvcard_export(const MESSAGE_CONTENT *pmsg, const char *log_id,
961961
pvalue = pmsg->proplist.get<char>(PROP_TAG(PROP_TYPE(g_vcarduid_proptag), propids[PROP_ID(g_vcarduid_proptag)-0x8000]));
962962
if (pvalue == nullptr) {
963963
auto guid = GUID::random_new();
964-
vcarduid = "uuid:" + bin2hex(&guid, sizeof(guid));
964+
vcarduid = "uuid:" + bin2hex(guid);
965965
pvalue = vcarduid.c_str();
966966
}
967967
if (pvalue != nullptr)

0 commit comments

Comments
 (0)