Declare counter var inside loop

We require c99/gnu99 anyways.
This commit is contained in:
Michael Vetter
2020-11-09 11:03:54 +01:00
parent 304f63f204
commit 35aecd425f
22 changed files with 94 additions and 163 deletions

View File

@@ -859,8 +859,7 @@ cons_show_account_list(gchar** accounts)
int size = g_strv_length(accounts);
if (size > 0) {
cons_show("Accounts:");
int i = 0;
for (i = 0; i < size; i++) {
for (int i = 0; i < size; i++) {
if ((connection_get_status() == JABBER_CONNECTED) && (g_strcmp0(session_get_account_name(), accounts[i]) == 0)) {
resource_presence_t presence = accounts_get_last_presence(accounts[i]);
theme_item_t presence_colour = theme_main_presence_attrs(string_from_resource_presence(presence));
@@ -2718,13 +2717,12 @@ cons_show_bookmarks_ignore(gchar** list, gsize len)
return;
}
int i;
ProfWin* console = wins_get_console();
cons_show("");
cons_show("Ignored bookmarks:");
for (i = 0; i < len; i++) {
for (int i = 0; i < len; i++) {
win_print(console, THEME_DEFAULT, "-", " %s", list[i]);
win_newline(console);
}

View File

@@ -1222,8 +1222,7 @@ void
ui_show_lines(ProfWin* window, gchar** lines)
{
if (lines) {
int i;
for (i = 0; lines[i] != NULL; i++) {
for (int i = 0; lines[i] != NULL; i++) {
win_println(window, THEME_DEFAULT, "-", "%s", lines[i]);
}
}

View File

@@ -296,8 +296,7 @@ status_bar_draw(void)
pos = 0;
}
gint max_tabs = prefs_get_statusbartabs();
int i = 1;
for (i = 1; i <= max_tabs; i++) {
for (int i = 1; i <= max_tabs; i++) {
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
if (tab) {
pos = _status_bar_draw_tab(tab, pos, i);
@@ -319,8 +318,7 @@ _extended_new(void)
return FALSE;
}
int i = 0;
for (i = max_tabs + 1; i <= tabs_count; i++) {
for (int i = max_tabs + 1; i <= tabs_count; i++) {
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
if (tab && tab->highlight) {
return TRUE;
@@ -527,8 +525,7 @@ _tabs_width(void)
if (show_name && show_number) {
int width = g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1;
int i = 0;
for (i = 1; i <= max_tabs; i++) {
for (int i = 1; i <= max_tabs; i++) {
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
if (tab) {
gboolean is_current = i == statusbar->current_tab;
@@ -547,8 +544,7 @@ _tabs_width(void)
if (show_name && !show_number) {
int width = g_hash_table_size(statusbar->tabs) > max_tabs ? 4 : 1;
int i = 0;
for (i = 1; i <= max_tabs; i++) {
for (int i = 1; i <= max_tabs; i++) {
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
if (tab) {
gboolean is_current = i == statusbar->current_tab;

View File

@@ -190,8 +190,7 @@ _title_bar_draw(void)
werase(win);
wmove(win, 0, 0);
int i;
for (i = 0; i < 45; i++) {
for (int i = 0; i < 45; i++) {
waddch(win, ' ');
}

View File

@@ -1613,8 +1613,7 @@ _win_print_internal(ProfWin* window, const char* show_char, int pad_indent, GDat
static void
_win_indent(WINDOW* win, int size)
{
int i = 0;
for (i = 0; i < size; i++) {
for (int i = 0; i < size; i++) {
waddch(win, ' ');
}
}
@@ -1743,8 +1742,7 @@ win_print_trackbar(ProfWin* window)
wbkgdset(window->layout->win, theme_attrs(THEME_TRACKBAR));
wattron(window->layout->win, theme_attrs(THEME_TRACKBAR));
int i;
for (i = 1; i < cols; i++) {
for (int i = 1; i < cols; i++) {
wprintw(window->layout->win, "-");
}
@@ -1756,11 +1754,11 @@ win_print_trackbar(ProfWin* window)
void
win_redraw(ProfWin* window)
{
int i, size;
int size;
werase(window->layout->win);
size = buffer_size(window->layout->buffer);
for (i = 0; i < size; i++) {
for (int i = 0; i < size; i++) {
ProfBuffEntry* e = buffer_get_entry(window->layout->buffer, i);
if (e->display_from == NULL && e->message && e->message[0] == '-') {
@@ -1935,12 +1933,12 @@ win_handle_command_exec_result_note(ProfWin* window, const char* const type, con
void
win_insert_last_read_position_marker(ProfWin* window, char* id)
{
int i, size;
int size;
size = buffer_size(window->layout->buffer);
// TODO: this is somewhat costly. We should improve this later.
// check if we already have a separator present
for (i = 0; i < size; i++) {
for (int i = 0; i < size; i++) {
ProfBuffEntry* e = buffer_get_entry(window->layout->buffer, i);
// if yes, don't print a new one