From e5ba839d1bf7982f7e71de1b8cefb13372804d34 Mon Sep 17 00:00:00 2001 From: Richard Date: Sun, 18 Feb 2024 16:04:28 -0700 Subject: [PATCH] Rename variables to avoid shadowing --- common/diskvid.cpp | 35 +++++++++++++++-------------------- common/editpal.cpp | 8 +++----- common/encoder.cpp | 14 +++++++------- common/fracsubr.cpp | 8 ++++---- common/fractals.cpp | 32 ++++++++++++++++---------------- common/framain2.cpp | 16 ++++++++-------- 6 files changed, 53 insertions(+), 60 deletions(-) diff --git a/common/diskvid.cpp b/common/diskvid.cpp index 64c5962c9..075b68847 100644 --- a/common/diskvid.cpp +++ b/common/diskvid.cpp @@ -624,13 +624,13 @@ static void write_cache_lru() switch (pixelshift) { case 0: - for (int i = 0; i < BLOCKLEN; ++i) + for (int j = 0; j < BLOCKLEN; ++j) { mem_putc(*(pixelptr++)); } break; case 1: - for (int i = 0; i < BLOCKLEN/2; ++i) + for (int j = 0; j < BLOCKLEN/2; ++j) { tmpchar = (BYTE)(*(pixelptr++) << 4); tmpchar = (BYTE)(tmpchar + *(pixelptr++)); @@ -638,9 +638,9 @@ static void write_cache_lru() } break; case 2: - for (int i = 0; i < BLOCKLEN/4; ++i) + for (int j = 0; j < BLOCKLEN/4; ++j) { - for (int j = 6; j >= 0; j -= 2) + for (int k = 6; k >= 0; k -= 2) { tmpchar = (BYTE)((tmpchar << 2) + *(pixelptr++)); } @@ -648,24 +648,19 @@ static void write_cache_lru() } break; case 3: - for (int i = 0; i < BLOCKLEN/8; ++i) + for (int j = 0; j < BLOCKLEN/8; ++j) { + // clang-format off mem_putc((BYTE) - ((((((((((((((*pixelptr - << 1) - | *(pixelptr+1)) - << 1) - | *(pixelptr+2)) - << 1) - | *(pixelptr+3)) - << 1) - | *(pixelptr+4)) - << 1) - | *(pixelptr+5)) - << 1) - | *(pixelptr+6)) - << 1) - | *(pixelptr+7))); + (((((((*pixelptr << 1 + | *(pixelptr + 1)) << 1 + | *(pixelptr + 2)) << 1 + | *(pixelptr + 3)) << 1 + | *(pixelptr + 4)) << 1 + | *(pixelptr + 5)) << 1 + | *(pixelptr + 6)) << 1 + | *(pixelptr + 7))); + // clang-format on pixelptr += 8; } break; diff --git a/common/editpal.cpp b/common/editpal.cpp index 837f1e5d4..0cf33282a 100644 --- a/common/editpal.cpp +++ b/common/editpal.cpp @@ -2545,14 +2545,12 @@ static void PalTable__other_key(int key, RGBEditor *rgb, void *info) case 'T': case 't': // s(T)ripe mode { - int key; - Cursor_Hide(); PalTable__DrawStatus(me, true); - key = getakeynohelp(); + const int key2 = getakeynohelp(); Cursor_Show(); - if (key >= '1' && key <= '9') + if (key2 >= '1' && key2 <= '9') { int a = me->curr[0], b = me->curr[1]; @@ -2568,7 +2566,7 @@ static void PalTable__other_key(int key, RGBEditor *rgb, void *info) if (a != b) { - mkpalrange(&me->pal[a], &me->pal[b], &me->pal[a], b-a, key-'0'); + mkpalrange(&me->pal[a], &me->pal[b], &me->pal[a], b-a, key2-'0'); PalTable__UpdateDAC(me); } } diff --git a/common/encoder.cpp b/common/encoder.cpp index 74befb1b4..8eb053f52 100644 --- a/common/encoder.cpp +++ b/common/encoder.cpp @@ -471,7 +471,7 @@ bool encoder() else { // uh oh - better fake it - for (int i = 0; i < 256; i += 16) + for (int j = 0; j < 256; j += 16) { if (!shftwrite((BYTE *)paletteEGA, 16)) { @@ -673,14 +673,14 @@ bool encoder() esave_info.max_random_mutation = g_evolve_info.max_random_mutation; esave_info.ecount = g_evolve_info.ecount; } - for (int i = 0; i < NUM_GENES; i++) + for (int j = 0; j < NUM_GENES; j++) { - esave_info.mutate[i] = (short)g_gene_bank[i].mutate; + esave_info.mutate[j] = (short)g_gene_bank[j].mutate; } - for (int i = 0; i < sizeof(esave_info.future) / sizeof(short); i++) + for (int j = 0; j < sizeof(esave_info.future) / sizeof(short); j++) { - esave_info.future[i] = 0; + esave_info.future[j] = 0; } // some XFRACT logic for the doubles needed here @@ -707,9 +707,9 @@ bool encoder() osave_info.oy3rd = g_orbit_corner_3_y; osave_info.keep_scrn_coords = (short) (g_keep_screen_coords ? 1 : 0); osave_info.drawmode = g_draw_mode; - for (int i = 0; i < sizeof(osave_info.future) / sizeof(short); i++) + for (short &j : osave_info.future) { - osave_info.future[i] = 0; + j = 0; } // some XFRACT logic for the doubles needed here diff --git a/common/fracsubr.cpp b/common/fracsubr.cpp index ce3cbc29b..8639c8e82 100644 --- a/common/fracsubr.cpp +++ b/common/fracsubr.cpp @@ -1552,7 +1552,7 @@ void sleepms(long ms) * last call has elapsed. */ #define MAX_INDEX 2 -static uclock_t next_time[MAX_INDEX]; +static uclock_t s_next_time[MAX_INDEX]; void wait_until(int index, uclock_t wait_time) { if (g_debug_flag == debug_flags::force_old_sleep) @@ -1562,21 +1562,21 @@ void wait_until(int index, uclock_t wait_time) else { uclock_t now; - while ((now = usec_clock()) < next_time[index]) + while ((now = usec_clock()) < s_next_time[index]) { if (driver_key_pressed()) { break; } } - next_time[index] = now + wait_time*100; // wait until this time next call + s_next_time[index] = now + wait_time*100; // wait until this time next call } } void reset_clock() { restart_uclock(); - std::fill(std::begin(next_time), std::end(next_time), 0); + std::fill(std::begin(s_next_time), std::end(s_next_time), 0); } #define LOG2 0.693147180F diff --git a/common/fractals.cpp b/common/fractals.cpp index 24bd92660..3a5673b5c 100644 --- a/common/fractals.cpp +++ b/common/fractals.cpp @@ -1727,17 +1727,17 @@ int MPCHalleyFractal() MPC mpcXtoAlessOne, mpcXtoA; MPC mpcXtoAplusOne; // a-1, a, a+1 MPC mpcFX, mpcF1prime, mpcF2prime, mpcHalnumer1; - MPC mpcHalnumer2, mpcHaldenom, mpctmp; + MPC mpcHalnumer2, mpcHaldenom, mpctmp2; g_mp_overflow = 0; mpcXtoAlessOne.x = mpcold.x; mpcXtoAlessOne.y = mpcold.y; for (int ihal = 2; ihal < g_degree; ihal++) { - mpctmp.x = *pMPsub(*pMPmul(mpcXtoAlessOne.x, mpcold.x), *pMPmul(mpcXtoAlessOne.y, mpcold.y)); - mpctmp.y = *pMPadd(*pMPmul(mpcXtoAlessOne.x, mpcold.y), *pMPmul(mpcXtoAlessOne.y, mpcold.x)); - mpcXtoAlessOne.x = mpctmp.x; - mpcXtoAlessOne.y = mpctmp.y; + mpctmp2.x = *pMPsub(*pMPmul(mpcXtoAlessOne.x, mpcold.x), *pMPmul(mpcXtoAlessOne.y, mpcold.y)); + mpctmp2.y = *pMPadd(*pMPmul(mpcXtoAlessOne.x, mpcold.y), *pMPmul(mpcXtoAlessOne.y, mpcold.x)); + mpcXtoAlessOne.x = mpctmp2.x; + mpcXtoAlessOne.y = mpctmp2.y; } mpcXtoA.x = *pMPsub(*pMPmul(mpcXtoAlessOne.x, mpcold.x), *pMPmul(mpcXtoAlessOne.y, mpcold.y)); mpcXtoA.y = *pMPadd(*pMPmul(mpcXtoAlessOne.x, mpcold.y), *pMPmul(mpcXtoAlessOne.y, mpcold.x)); @@ -1753,21 +1753,21 @@ int MPCHalleyFractal() mpcF1prime.x = *pMPsub(*pMPmul(g_halley_mp_a_plus_one, mpcXtoA.x), g_mp_one); mpcF1prime.y = *pMPmul(g_halley_mp_a_plus_one, mpcXtoA.y); // F' - mpctmp.x = *pMPsub(*pMPmul(mpcF2prime.x, mpcFX.x), *pMPmul(mpcF2prime.y, mpcFX.y)); - mpctmp.y = *pMPadd(*pMPmul(mpcF2prime.x, mpcFX.y), *pMPmul(mpcF2prime.y, mpcFX.x)); + mpctmp2.x = *pMPsub(*pMPmul(mpcF2prime.x, mpcFX.x), *pMPmul(mpcF2prime.y, mpcFX.y)); + mpctmp2.y = *pMPadd(*pMPmul(mpcF2prime.x, mpcFX.y), *pMPmul(mpcF2prime.y, mpcFX.x)); // F * F" mpcHaldenom.x = *pMPadd(mpcF1prime.x, mpcF1prime.x); mpcHaldenom.y = *pMPadd(mpcF1prime.y, mpcF1prime.y); // 2 * F' - mpcHalnumer1 = MPCdiv(mpctmp, mpcHaldenom); // F"F/2F' - mpctmp.x = *pMPsub(mpcF1prime.x, mpcHalnumer1.x); - mpctmp.y = *pMPsub(mpcF1prime.y, mpcHalnumer1.y); // F' - F"F/2F' - mpcHalnumer2 = MPCdiv(mpcFX, mpctmp); + mpcHalnumer1 = MPCdiv(mpctmp2, mpcHaldenom); // F"F/2F' + mpctmp2.x = *pMPsub(mpcF1prime.x, mpcHalnumer1.x); + mpctmp2.y = *pMPsub(mpcF1prime.y, mpcHalnumer1.y); // F' - F"F/2F' + mpcHalnumer2 = MPCdiv(mpcFX, mpctmp2); - mpctmp = MPCmul(g_mpc_temp_param, mpcHalnumer2); // mpctmpparm is + mpctmp2 = MPCmul(g_mpc_temp_param, mpcHalnumer2); // mpctmpparm is // relaxation coef. - mpcnew = MPCsub(mpcold, mpctmp); + mpcnew = MPCsub(mpcold, mpctmp2); g_new_z = MPC2cmplx(mpcnew); return MPCHalleybailout() || g_mp_overflow; #else @@ -2113,11 +2113,11 @@ static int TryFloatFractal(int (*fpFractal)()) int TrigXTrigFractal() { #if !defined(XFRACT) - LComplex ltmp2; + LComplex ltmp3; // z = trig0(z)*trig1(z) LCMPLXtrig0(g_l_old_z, g_l_temp); - LCMPLXtrig1(g_l_old_z, ltmp2); - LCMPLXmult(g_l_temp, ltmp2, g_l_new_z); + LCMPLXtrig1(g_l_old_z, ltmp3); + LCMPLXmult(g_l_temp, ltmp3, g_l_new_z); if (g_overflow) { TryFloatFractal(TrigXTrigfpFractal); diff --git a/common/framain2.cpp b/common/framain2.cpp index 26af59185..d9a397016 100644 --- a/common/framain2.cpp +++ b/common/framain2.cpp @@ -270,11 +270,11 @@ main_state big_while_loop(bool *const kbdmore, bool *const stacked, bool const r if (g_map_specified) { // but there's a map=, so load that - for (int i = 0; i < 256; ++i) + for (int j = 0; j < 256; ++j) { - g_dac_box[i][0] = g_map_clut[i][0]; - g_dac_box[i][1] = g_map_clut[i][1]; - g_dac_box[i][2] = g_map_clut[i][2]; + g_dac_box[j][0] = g_map_clut[j][0]; + g_dac_box[j][1] = g_map_clut[j][1]; + g_dac_box[j][2] = g_map_clut[j][2]; } spindac(0, 1); } @@ -1114,9 +1114,9 @@ main_state main_menu_switch(int *kbdchar, bool *frommandel, bool *kbdmore, bool int err; double oldparm[MAX_PARAMS]; fractal_type oldtype = g_fractal_type; - for (int i = 0; i < MAX_PARAMS; ++i) + for (int j = 0; j < MAX_PARAMS; ++j) { - oldparm[i] = g_params[i]; + oldparm[j] = g_params[j]; } if (g_fractal_type != fractal_type::ANT) { @@ -1143,9 +1143,9 @@ main_state main_menu_switch(int *kbdchar, bool *frommandel, bool *kbdmore, bool driver_unstack_screen(); } g_fractal_type = oldtype; - for (int i = 0; i < MAX_PARAMS; ++i) + for (int j = 0; j < MAX_PARAMS; ++j) { - g_params[i] = oldparm[i]; + g_params[j] = oldparm[j]; } if (err >= 0) {