Cleanup: reduce variable scope

5 files changed, 15 insertions, 25 deletions

diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index a35feb62c9d..962c4e4c59d 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -823,7 +823,6 @@ int sequencer_image_seq_get_minmax_frame(wmOperator *op,
 void sequencer_image_seq_reserve_frames(
     wmOperator *op, StripElem *se, int len, int minframe, int numdigits)
 {
-  int i;
   char *filename = NULL;
   RNA_BEGIN (op->ptr, itemptr, "files") {
     filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0);
@@ -837,7 +836,7 @@ void sequencer_image_seq_reserve_frames(
     /* Strip the frame from filename and substitute with `#`. */
     BLI_path_frame_strip(filename, ext);
 
-    for (i = 0; i < len; i++, se++) {
+    for (int i = 0; i < len; i++, se++) {
       BLI_strncpy(filename_stripped, filename, sizeof(filename_stripped));
       BLI_path_frame(filename_stripped, minframe + i, numdigits);
       BLI_snprintf(se->name, sizeof(se->name), "%s%s", filename_stripped, ext);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 70735a8ec82..662be2491a0 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -242,7 +242,6 @@ static void draw_seq_waveform(View2D *v2d,
   int x2_offset = min_ff(v2d->cur.xmax + 1.0f, x2);
 
   if (seq->sound && ((sseq->flag & SEQ_ALL_WAVEFORMS) || (seq->flag & SEQ_AUDIO_DRAW_WAVEFORM))) {
-    int i, j, p;
     int length = floor((x2_offset - x1_offset) / stepsize) + 1;
     float ymid = (y1 + y2) / 2.0f;
     float yscale = (y2 - y1) / 2.0f;
@@ -303,15 +302,15 @@ static void draw_seq_waveform(View2D *v2d,
     immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
     immBegin(GPU_PRIM_TRI_STRIP, length * 2);
 
-    for (i = 0; i < length; i++) {
+    for (int i = 0; i < length; i++) {
       float sampleoffset = startsample + ((x1_offset - x1) / stepsize + i) * samplestep;
-      p = sampleoffset;
+      int p = sampleoffset;
 
       value1 = waveform->data[p * 3];
       value2 = waveform->data[p * 3 + 1];
 
       if (samplestep > 1.0f) {
-        for (j = p + 1; (j < waveform->length) && (j < p + samplestep); j++) {
+        for (int j = p + 1; (j < waveform->length) && (j < p + samplestep); j++) {
           if (value1 > waveform->data[j * 3]) {
             value1 = waveform->data[j * 3];
           }
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index f175c2a7419..e446a1a5ed7 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -1482,7 +1482,7 @@ static int sequencer_slip_invoke(bContext *C, wmOperator *op, const wmEvent *eve
   Scene *scene = CTX_data_scene(C);
   Editing *ed = BKE_sequencer_editing_get(scene, false);
   float mouseloc[2];
-  int num_seq, i;
+  int num_seq;
   View2D *v2d = UI_view2d_fromcontext(C);
 
   /* Recursively count the trimmed elements. */
@@ -1506,7 +1506,7 @@ static int sequencer_slip_invoke(bContext *C, wmOperator *op, const wmEvent *eve
 
   slip_add_sequences_recursive(ed->seqbasep, data->seq_array, data->trim, 0, true);
 
-  for (i = 0; i < num_seq; i++) {
+  for (int i = 0; i < num_seq; i++) {
     transseq_backup(data->ts + i, data->seq_array[i]);
   }
 
@@ -1611,21 +1611,19 @@ static void sequencer_slip_apply_limits(SlipData *data, int *offset)
 
 static int sequencer_slip_exec(bContext *C, wmOperator *op)
 {
-  SlipData *data;
   Scene *scene = CTX_data_scene(C);
   Editing *ed = BKE_sequencer_editing_get(scene, false);
-  int num_seq, i;
   int offset = RNA_int_get(op->ptr, "offset");
   bool success = false;
 
   /* Recursively count the trimmed elements. */
-  num_seq = slip_count_sequences_recursive(ed->seqbasep, true);
+  int num_seq = slip_count_sequences_recursive(ed->seqbasep, true);
 
   if (num_seq == 0) {
     return OPERATOR_CANCELLED;
   }
 
-  data = op->customdata = MEM_mallocN(sizeof(SlipData), "trimdata");
+  SlipData *data = op->customdata = MEM_mallocN(sizeof(SlipData), "trimdata");
   data->ts = MEM_mallocN(num_seq * sizeof(TransSeq), "trimdata_transform");
   data->seq_array = MEM_mallocN(num_seq * sizeof(Sequence *), "trimdata_sequences");
   data->trim = MEM_mallocN(num_seq * sizeof(bool), "trimdata_trim");
@@ -1633,7 +1631,7 @@ static int sequencer_slip_exec(bContext *C, wmOperator *op)
 
   slip_add_sequences_recursive(ed->seqbasep, data->seq_array, data->trim, 0, true);
 
-  for (i = 0; i < num_seq; i++) {
+  for (int i = 0; i < num_seq; i++) {
     transseq_backup(data->ts + i, data->seq_array[i]);
   }
 
@@ -1749,14 +1747,13 @@ static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *even
 
     case EVT_ESCKEY:
     case RIGHTMOUSE: {
-      int i;
       Editing *ed = BKE_sequencer_editing_get(scene, false);
 
-      for (i = 0; i < data->num_seq; i++) {
+      for (int i = 0; i < data->num_seq; i++) {
         transseq_restore(data->ts + i, data->seq_array[i]);
       }
 
-      for (i = 0; i < data->num_seq; i++) {
+      for (int i = 0; i < data->num_seq; i++) {
         Sequence *seq = data->seq_array[i];
         BKE_sequence_reload_new_file(bmain, scene, seq, false);
         BKE_sequence_calc(scene, seq);
diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c
index 58a6f274310..1639870fee2 100644
--- a/source/blender/editors/space_sequencer/sequencer_scopes.c
+++ b/source/blender/editors/space_sequencer/sequencer_scopes.c
@@ -123,11 +123,9 @@ static void wform_put_border(uchar *tgt, int w, int h)
 
 static void wform_put_gridrow(uchar *tgt, float perc, int w, int h)
 {
-  int i;
-
   tgt += (int)(perc / 100.0f * h) * w * 4;
 
-  for (i = 0; i < w * 2; i++) {
+  for (int i = 0; i < w * 2; i++) {
     tgt[0] = 255;
 
     tgt += 4;
@@ -415,11 +413,10 @@ static void draw_histogram_marker(ImBuf *ibuf, int x)
 {
   uchar *p = (uchar *)ibuf->rect;
   int barh = ibuf->y * 0.1;
-  int i;
 
   p += 4 * (x + ibuf->x * (ibuf->y - barh + 1));
 
-  for (i = 0; i < barh - 1; i++) {
+  for (int i = 0; i < barh - 1; i++) {
     p[0] = p[1] = p[2] = 255;
     p += ibuf->x * 4;
   }
@@ -429,11 +426,10 @@ static void draw_histogram_bar(ImBuf *ibuf, int x, float val, int col)
 {
   uchar *p = (uchar *)ibuf->rect;
   int barh = ibuf->y * val * 0.9f;
-  int i;
 
   p += 4 * (x + ibuf->x);
 
-  for (i = 0; i < barh; i++) {
+  for (int i = 0; i < barh; i++) {
     p[col] = 255;
     p += ibuf->x * 4;
   }
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 955b4dba5e8..96a1776d763 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -1388,9 +1388,8 @@ static bool select_grouped_effect(Editing *ed, Sequence *actseq, const int chann
   Sequence *seq;
   bool changed = false;
   bool effects[SEQ_TYPE_MAX + 1];
-  int i;
 
-  for (i = 0; i <= SEQ_TYPE_MAX; i++) {
+  for (int i = 0; i <= SEQ_TYPE_MAX; i++) {
     effects[i] = false;
   }