Skip to content

Commit d861d60

Browse files
committed
build: resolve build failures under -DCOMPILE_DIAG
``` rtf.cpp: In member function 'push_da_pic': rtf.cpp:2604:37: error: use of deleted function 'ec_error_t::operator bool()' 2604 | if ((ret = atx->proplist.set(PR_ATTACH_MIME_TAG, img_ctype)) != ecSuccess || ``` Fixes: gromox-2.44-102-g0e07767b8
1 parent 0fa15fe commit d861d60

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

exch/zcore/ics_state.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ BINARY *ics_state::serialize()
9090

9191
if (ICS_TYPE_CONTENTS == pstate->type) {
9292
decltype(ser) s(pstate->pseen_fai->serialize());
93-
if (s == nullptr || pproplist->set(MetaTagCnsetSeenFAI, s.get()) != 0)
93+
if (s == nullptr || pproplist->set(MetaTagCnsetSeenFAI, s.get()) != ecSuccess)
9494
return NULL;
9595
}
9696

lib/mapi/rtf.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ struct rtf_reader final {
256256
bool build_font_table(SIMPLE_TREE_NODE *);
257257
bool escape_output(char *);
258258
bool word_output_date(SIMPLE_TREE_NODE *);
259-
errno_t push_da_pic(EXT_PUSH &, const char *, const char *, const char *, const char *);
259+
int push_da_pic(EXT_PUSH &, const char *, const char *, const char *, const char *);
260260

261261
CMD_PROC_FN cmd_ansi, cmd_ansicpg, cmd_b, cmd_bullet, cmd_caps, cmd_cb,
262262
cmd_cf, cmd_colortbl, cmd_continue, cmd_deff, cmd_dn, cmd_emboss,
@@ -2580,7 +2580,7 @@ static CMD_PROC_FUNC rtf_find_fromhtml_func(const char *s)
25802580
return nullptr;
25812581
}
25822582

2583-
errno_t rtf_reader::push_da_pic(EXT_PUSH &picture_push, const char *img_ctype,
2583+
int rtf_reader::push_da_pic(EXT_PUSH &picture_push, const char *img_ctype,
25842584
const char *pext, const char *cid_name, const char *picture_name)
25852585
{
25862586
auto reader = this;
@@ -2592,14 +2592,14 @@ errno_t rtf_reader::push_da_pic(EXT_PUSH &picture_push, const char *img_ctype,
25922592
picture_push.p_uint8(0) != EXT_ERR_SUCCESS ||
25932593
!decode_hex_binary(picture_push.m_cdata, bin.pv, bin.cb)) {
25942594
free(bin.pv);
2595-
return EINVAL;
2595+
return -EINVAL;
25962596
}
25972597
auto atx = attachment_content_init();
25982598
if (atx == nullptr || !reader->pattachments->append_internal(atx)) {
25992599
free(bin.pv);
2600-
return EINVAL;
2600+
return -EINVAL;
26012601
}
2602-
int ret;
2602+
ec_error_t ret;
26032603
uint32_t flags = ATT_MHTML_REF;
26042604
if ((ret = atx->proplist.set(PR_ATTACH_MIME_TAG, img_ctype)) != ecSuccess ||
26052605
(ret = atx->proplist.set(PR_ATTACH_CONTENT_ID, cid_name)) != ecSuccess ||
@@ -2608,13 +2608,13 @@ errno_t rtf_reader::push_da_pic(EXT_PUSH &picture_push, const char *img_ctype,
26082608
(ret = atx->proplist.set(PR_ATTACH_FLAGS, &flags)) != ecSuccess ||
26092609
(ret = atx->proplist.set(PR_ATTACH_DATA_BIN, &bin)) != ecSuccess) {
26102610
free(bin.pv);
2611-
return ret;
2611+
return ece2nerrno(ret);
26122612
}
26132613
free(bin.pv);
26142614
if (reader->ext_push.p_bytes(TAG_IMAGELINK_BEGIN, sizeof(TAG_IMAGELINK_BEGIN) - 1) != EXT_ERR_SUCCESS ||
26152615
reader->ext_push.p_bytes(cid_name, strlen(cid_name)) != EXT_ERR_SUCCESS ||
26162616
reader->ext_push.p_bytes(TAG_IMAGELINK_END, sizeof(TAG_IMAGELINK_END) - 1) != EXT_ERR_SUCCESS)
2617-
return EINVAL;
2617+
return -EINVAL;
26182618
return 0;
26192619
}
26202620

tools/genimport.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ int exm_set_change_keys(TPROPVAL_ARRAY *props, eid_t change_num)
224224
fprintf(stderr, "exm: pcl_serialize: ENOMEM\n");
225225
return -ENOMEM;
226226
}
227-
int ret;
227+
ec_error_t ret;
228228
if ((ret = props->set(PidTagChangeNumber, &change_num)) != ecSuccess ||
229229
(ret = props->set(PR_CHANGE_KEY, &bxid)) != ecSuccess ||
230230
(ret = props->set(PR_PREDECESSOR_CHANGE_LIST, pclbin.get())) != ecSuccess) {
231-
fprintf(stderr, "%s: %s\n", __func__, strerror(-ret));
232-
return ret;
231+
fprintf(stderr, "%s: %s\n", __func__, mapi_strerror(ret));
232+
return ece2nerrno(ret);
233233
}
234234
return 0;
235235
}
@@ -403,7 +403,7 @@ int exm_create_msg(uint64_t parent_fld, MESSAGE_CONTENT *ctnt)
403403
(ret = props->set(PidTagChangeNumber, &change_num)) != ecSuccess ||
404404
(ret = props->set(PR_CHANGE_KEY, &bxid)) != ecSuccess ||
405405
(ret = props->set(PR_PREDECESSOR_CHANGE_LIST, pclbin.get())) != ecSuccess) {
406-
fprintf(stderr, "exm: tpropval: %s\n", strerror(-ret));
406+
fprintf(stderr, "exm: tpropval: %s\n", mapi_strerror(ret));
407407
return ece2nerrno(ret);
408408
}
409409
if (!exmdb_client->write_message(g_storedir, CP_UTF8, parent_fld, ctnt, &ret)) {

0 commit comments

Comments
 (0)