Skip to content

Commit 7c54e48

Browse files
committed
all: make error codes unique again
1 parent 97e2fac commit 7c54e48

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

exch/midb/mail_engine.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static std::unique_ptr<char[]> mail_engine_ct_to_utf8(const char *charset,
244244
iconv_close(conv_id);
245245
return ret_string;
246246
} catch (const std::bad_alloc &) {
247-
fprintf(stderr, "E-1924: ENOMEM\n");
247+
fprintf(stderr, "E-1963: ENOMEM\n");
248248
return nullptr;
249249
}
250250

@@ -433,7 +433,7 @@ static std::unique_ptr<char[]> mail_engine_ct_decode_mime(const char *charset,
433433
out_buff[offset] = '\0';
434434
return ret_string;
435435
} catch (const std::bad_alloc &) {
436-
fprintf(stderr, "E-1923: ENOMEM\n");
436+
fprintf(stderr, "E-1968: ENOMEM\n");
437437
return nullptr;
438438
}
439439

@@ -491,7 +491,7 @@ static void mail_engine_ct_enum_mime(MJSON_MIME *pmime, void *param) try
491491
strlen(rs.get())) != nullptr)
492492
penum->b_result = TRUE;
493493
} catch (const std::bad_alloc &) {
494-
fprintf(stderr, "E-1925: ENOMEM\n");
494+
fprintf(stderr, "E-1970: ENOMEM\n");
495495
}
496496

497497
static BOOL mail_engine_ct_search_head(const char *charset,
@@ -1363,7 +1363,7 @@ static std::unique_ptr<CONDITION_TREE> mail_engine_ct_build_internal(
13631363
}
13641364
return plist;
13651365
} catch (const std::bad_alloc &) {
1366-
fprintf(stderr, "E-1926: ENOMEM\n");
1366+
fprintf(stderr, "E-1971: ENOMEM\n");
13671367
return {};
13681368
}
13691369

exch/nsp/nsp_interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ static BOOL nsp_interface_match_node(const SIMPLE_TREE_NODE *pnode,
13171317
cmp = strcasecmp(prop_val.value.pstr, pfilter->res.res_property.pprop->value.pstr);
13181318
break;
13191319
default:
1320-
fprintf(stderr, "E-1922: unhandled proptag %xh\n", pfilter->res.res_property.proptag);
1320+
fprintf(stderr, "E-1967: unhandled proptag %xh\n", pfilter->res.res_property.proptag);
13211321
return false;
13221322
}
13231323
return three_way_eval(static_cast<relop>(pfilter->res.res_property.relop), cmp) ? TRUE : false;

lib/email/mime.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ BOOL MIME::write_content(const char *pcontent, size_t length,
365365
}
366366
return false;
367367
} catch (const std::bad_alloc &) {
368-
fprintf(stderr, "E-1929: ENOMEM\n");
368+
fprintf(stderr, "E-1966: ENOMEM\n");
369369
return false;
370370
}
371371

@@ -1386,7 +1386,7 @@ BOOL MIME::read_content(char *out_buff, size_t *plength) try
13861386
}
13871387
}
13881388
} catch (const std::bad_alloc &) {
1389-
debug_info("[mime]: E-1928: Failed to allocate memory in MIME::read_content");
1389+
debug_info("[mime]: E-1973: Failed to allocate memory in MIME::read_content");
13901390
*plength = 0;
13911391
return false;
13921392
}

lib/mapi/oxcmail.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3262,7 +3262,7 @@ static BOOL oxcmail_parse_smime_message(MAIL *pmail, MESSAGE_CONTENT *pmsg) try
32623262
return FALSE;
32633263
return TRUE;
32643264
} catch (const std::bad_alloc &) {
3265-
fprintf(stderr, "E-1927: ENOMEM\n");
3265+
fprintf(stderr, "E-1972: ENOMEM\n");
32663266
return false;
32673267
}
32683268

0 commit comments

Comments
 (0)