Skip to content

Commit 6a26816

Browse files
committed
midb: replace bad variable names in mail_engine_mcopy
See, once you give some sensible names, you easily spot that allocate_cn is called with the wrong argument. Fixes: gromox-0~666
1 parent 426f296 commit 6a26816

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

exch/midb/mail_engine.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,11 +2421,11 @@ static int mail_engine_mcopy(int argc, char **argv, int sockd) try
24212421

24222422
if (strlen(argv[4]) >= 1024)
24232423
return MIDB_E_PARAMETER_ERROR;
2424-
auto eml_path = argv[1] + "/eml/"s + argv[3];
2424+
auto eml_src = argv[1] + "/eml/"s + argv[3];
24252425
size_t slurp_size = 0;
2426-
std::unique_ptr<char[], stdlib_delete> pbuff(HX_slurp_file(eml_path.c_str(), &slurp_size));
2426+
std::unique_ptr<char[], stdlib_delete> pbuff(HX_slurp_file(eml_src.c_str(), &slurp_size));
24272427
if (pbuff == nullptr) {
2428-
mlog(LV_ERR, "E-2074: Opening %s for reading failed: %s", eml_path.c_str(), strerror(errno));
2428+
mlog(LV_ERR, "E-2074: Opening %s for reading failed: %s", eml_src.c_str(), strerror(errno));
24292429
return errno == ENOMEM ? MIDB_E_NO_MEMORY : MIDB_E_DISK_ERROR;
24302430
}
24312431

@@ -2435,11 +2435,11 @@ static int mail_engine_mcopy(int argc, char **argv, int sockd) try
24352435
auto pidb = mail_engine_get_idb(argv[1]);
24362436
if (pidb == nullptr)
24372437
return MIDB_E_HASHTABLE_FULL;
2438-
auto folder_id = mail_engine_get_folder_id(pidb.get(), argv[2]);
2439-
if (folder_id == 0)
2438+
auto src_fid = mail_engine_get_folder_id(pidb.get(), argv[2]);
2439+
if (src_fid == 0)
24402440
return MIDB_E_NO_FOLDER;
2441-
auto folder_id1 = mail_engine_get_folder_id(pidb.get(), argv[4]);
2442-
if (folder_id1 == 0)
2441+
auto dst_fid = mail_engine_get_folder_id(pidb.get(), argv[4]);
2442+
if (dst_fid == 0)
24432443
return MIDB_E_NO_FOLDER;
24442444
/* Match this column list to ctm_field */
24452445
auto pstmt = gx_sql_prep(pidb->psqlite, "SELECT message_id, mod_time, "
@@ -2450,7 +2450,7 @@ static int mail_engine_mcopy(int argc, char **argv, int sockd) try
24502450
return MIDB_E_SQLPREP;
24512451
sqlite3_bind_text(pstmt, 1, argv[3], -1, SQLITE_STATIC);
24522452
if (pstmt.step() != SQLITE_ROW ||
2453-
pstmt.col_uint64(CTM_FOLDERID) != folder_id)
2453+
pstmt.col_uint64(CTM_FOLDERID) != src_fid)
24542454
return MIDB_E_NO_MESSAGE;
24552455

24562456
std::string flags_buff = "(";
@@ -2495,23 +2495,23 @@ static int mail_engine_mcopy(int argc, char **argv, int sockd) try
24952495
return MIDB_E_NO_MEMORY;
24962496
}
24972497
if (!exmdb_client::allocate_message_id(argv[1],
2498-
rop_util_make_eid_ex(1, folder_id), &message_id) ||
2498+
rop_util_make_eid_ex(1, src_fid), &message_id) ||
24992499
!exmdb_client::allocate_cn(argv[1], &change_num))
25002500
return MIDB_E_MDB_ALLOCID;
25012501

25022502
auto mid_string = std::to_string(time(nullptr)) + "." +
25032503
std::to_string(++g_sequence_id) + ".midb";
2504-
eml_path = argv[1] + "/eml/"s + argv[3];
2505-
auto eml_path1 = argv[1] + "/eml/"s + mid_string;
2506-
if (link(eml_path.c_str(), eml_path1.c_str()) != 0)
2504+
eml_src = argv[1] + "/eml/"s + argv[3];
2505+
auto eml_dst = argv[1] + "/eml/"s + mid_string;
2506+
if (link(eml_src.c_str(), eml_dst.c_str()) != 0)
25072507
mlog(LV_ERR, "E-2083: link %s %s: %s",
2508-
eml_path.c_str(), eml_path1.c_str(),
2508+
eml_src.c_str(), eml_dst.c_str(),
25092509
strerror(errno));
2510-
eml_path = argv[1] + "/ext/"s + argv[3];
2511-
eml_path1 = argv[1] + "/ext/"s + mid_string;
2512-
if (link(eml_path.c_str(), eml_path1.c_str()) != 0)
2510+
eml_src = argv[1] + "/ext/"s + argv[3];
2511+
eml_dst = argv[1] + "/ext/"s + mid_string;
2512+
if (link(eml_src.c_str(), eml_dst.c_str()) != 0)
25132513
mlog(LV_ERR, "E-2084: link %s %s: %s",
2514-
eml_path.c_str(), eml_path1.c_str(),
2514+
eml_src.c_str(), eml_dst.c_str(),
25152515
strerror(errno));
25162516
snprintf(sql_string, std::size(sql_string), "INSERT INTO mapping"
25172517
" (message_id, mid_string, flag_string) VALUES"
@@ -2542,7 +2542,7 @@ static int mail_engine_mcopy(int argc, char **argv, int sockd) try
25422542
cpid = static_cast<cpid_t>(1252);
25432543
ec_error_t e_result = ecRpcFailed;
25442544
if (!exmdb_client::write_message(argv[1], cpid,
2545-
rop_util_make_eid_ex(1, folder_id1), pmsgctnt, &e_result) ||
2545+
rop_util_make_eid_ex(1, dst_fid), pmsgctnt, &e_result) ||
25462546
e_result != ecSuccess)
25472547
return MIDB_E_MDB_WRITEMESSAGE;
25482548
cl_msg.release();

0 commit comments

Comments
 (0)