devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 01:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declare counter var inside loop

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/config/accounts.c
View File

@@ -77,8 +77,7 @@ accounts_load(void)
gsize naccounts;
gchar** account_names = g_key_file_get_groups(accounts, &naccounts);
gsize i;
for (i = 0; i < naccounts; i++) {
for (gsize i = 0; i < naccounts; i++) {
autocomplete_add(all_ac, account_names[i]);
if (g_key_file_get_boolean(accounts, account_names[i], "enabled", NULL)) {
autocomplete_add(enabled_ac, account_names[i]);
@@ -252,8 +251,7 @@ accounts_get_account(const char* const name)
GList* otr_manual = NULL;
gchar** manual = g_key_file_get_string_list(accounts, name, "otr.manual", &length, NULL);
if (manual) {
int i;
for (i = 0; i < length; i++) {
for (int i = 0; i < length; i++) {
otr_manual = g_list_append(otr_manual, strdup(manual[i]));
}
g_strfreev(manual);
@@ -262,8 +260,7 @@ accounts_get_account(const char* const name)
GList* otr_opportunistic = NULL;
gchar** opportunistic = g_key_file_get_string_list(accounts, name, "otr.opportunistic", &length, NULL);
if (opportunistic) {
int i;
for (i = 0; i < length; i++) {
for (int i = 0; i < length; i++) {
otr_opportunistic = g_list_append(otr_opportunistic, strdup(opportunistic[i]));
}
g_strfreev(opportunistic);
@@ -272,8 +269,7 @@ accounts_get_account(const char* const name)
GList* otr_always = NULL;
gchar** always = g_key_file_get_string_list(accounts, name, "otr.always", &length, NULL);
if (always) {
int i;
for (i = 0; i < length; i++) {
for (int i = 0; i < length; i++) {
otr_always = g_list_append(otr_always, strdup(always[i]));
}
g_strfreev(always);
@@ -287,8 +283,7 @@ accounts_get_account(const char* const name)
GList* omemo_enabled = NULL;
gchar** enabled_list = g_key_file_get_string_list(accounts, name, "omemo.enabled", &length, NULL);
if (enabled_list) {
int i;
for (i = 0; i < length; i++) {
for (int i = 0; i < length; i++) {
omemo_enabled = g_list_append(omemo_enabled, strdup(enabled_list[i]));
}
g_strfreev(enabled_list);
@@ -297,8 +292,7 @@ accounts_get_account(const char* const name)
GList* omemo_disabled = NULL;
gchar** disabled_list = g_key_file_get_string_list(accounts, name, "omemo.disabled", &length, NULL);
if (disabled_list) {
int i;
for (i = 0; i < length; i++) {
for (int i = 0; i < length; i++) {
omemo_disabled = g_list_append(omemo_disabled, strdup(disabled_list[i]));
}
g_strfreev(disabled_list);
@@ -425,8 +419,7 @@ accounts_rename(const char* const account_name, const char* const new_name)
"tls.policy"
};
int i;
for (i = 0; i < ARRAY_SIZE(string_keys); i++) {
for (int i = 0; i < ARRAY_SIZE(string_keys); i++) {
char* value = g_key_file_get_string(accounts, account_name, string_keys[i], NULL);
if (value) {
g_key_file_set_string(accounts, new_name, string_keys[i], value);

12
src/config/color.c
View File

@@ -343,12 +343,11 @@ color_distance(const struct color_def* a, const struct color_def* b)
static int
find_closest_col(int h, int s, int l)
{
int i;
struct color_def a = { h, s, l };
int min = 0;
int dmin = color_distance(&a, &color_names[0]);
for (i = 1; i < COLOR_NAME_SIZE; i++) {
for (int i = 1; i < COLOR_NAME_SIZE; i++) {
int d = color_distance(&a, &color_names[i]);
if (d < dmin) {
dmin = d;
@@ -361,7 +360,6 @@ find_closest_col(int h, int s, int l)
static int
find_col(const char* col_name, int n)
{
int i;
char name[32] = { 0 };
/*
@@ -381,7 +379,7 @@ find_col(const char* col_name, int n)
return -1;
}
for (i = 0; i < COLOR_NAME_SIZE; i++) {
for (int i = 0; i < COLOR_NAME_SIZE; i++) {
if (g_ascii_strcasecmp(name, color_names[i].name) == 0) {
return i;
}
@@ -462,8 +460,6 @@ color_pair_cache_reset(void)
static int
_color_pair_cache_get(int fg, int bg)
{
int i;
if (COLORS < 256) {
if (fg > 7 || bg > 7) {
log_error("Color: trying to load 256 colour theme without capable terminal");
@@ -472,7 +468,7 @@ _color_pair_cache_get(int fg, int bg)
}
/* try to find pair in cache */
for (i = 0; i < cache.size; i++) {
for (int i = 0; i < cache.size; i++) {
if (fg == cache.pairs[i].fg && bg == cache.pairs[i].bg) {
return i;
}
@@ -486,7 +482,7 @@ _color_pair_cache_get(int fg, int bg)
return -1;
}
i = cache.size;
int i = cache.size;
cache.pairs[i].fg = fg;
cache.pairs[i].bg = bg;
/* (re-)define the new pair in curses */

39
src/config/preferences.c
View File

@@ -194,8 +194,7 @@ _prefs_load(void)
gsize len = 0;
gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
int i = 0;
for (i = 0; i < len; i++) {
for (int i = 0; i < len; i++) {
autocomplete_add(room_trigger_ac, triggers[i]);
}
g_strfreev(triggers);
@@ -312,14 +311,15 @@ prefs_message_get_triggers(const char* const message)
char* message_lower = g_utf8_strdown(message, -1);
gsize len = 0;
gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
int i;
for (i = 0; i < len; i++) {
for (int i = 0; i < len; i++) {
char* trigger_lower = g_utf8_strdown(triggers[i], -1);
if (g_strrstr(message_lower, trigger_lower)) {
result = g_list_append(result, strdup(triggers[i]));
}
g_free(trigger_lower);
}
g_strfreev(triggers);
g_free(message_lower);
@@ -1384,8 +1384,7 @@ prefs_get_room_notify_triggers(void)
gsize len = 0;
gchar** triggers = g_key_file_get_string_list(prefs, PREF_GROUP_NOTIFICATIONS, "room.trigger.list", &len, NULL);
int i;
for (i = 0; i < len; i++) {
for (int i = 0; i < len; i++) {
result = g_list_append(result, strdup(triggers[i]));
}
@@ -1476,8 +1475,7 @@ prefs_titlebar_pos_up(void)
{
ProfWinPlacement* placement = prefs_get_win_placement();
int pos = 2;
for (pos = 2; pos < 5; pos++) {
for (int pos = 2; pos < 5; pos++) {
if (placement->titlebar_pos == pos) {
placement->titlebar_pos = pos - 1;
@@ -1504,8 +1502,7 @@ prefs_mainwin_pos_up(void)
{
ProfWinPlacement* placement = prefs_get_win_placement();
int pos = 2;
for (pos = 2; pos < 5; pos++) {
for (int pos = 2; pos < 5; pos++) {
if (placement->mainwin_pos == pos) {
placement->mainwin_pos = pos - 1;
@@ -1532,8 +1529,7 @@ prefs_statusbar_pos_up(void)
{
ProfWinPlacement* placement = prefs_get_win_placement();
int pos = 2;
for (pos = 2; pos < 5; pos++) {
for (int pos = 2; pos < 5; pos++) {
if (placement->statusbar_pos == pos) {
placement->statusbar_pos = pos - 1;
@@ -1560,8 +1556,7 @@ prefs_inputwin_pos_up(void)
{
ProfWinPlacement* placement = prefs_get_win_placement();
int pos = 2;
for (pos = 2; pos < 5; pos++) {
for (int pos = 2; pos < 5; pos++) {
if (placement->inputwin_pos == pos) {
placement->inputwin_pos = pos - 1;
@@ -1588,8 +1583,7 @@ prefs_titlebar_pos_down(void)
{
ProfWinPlacement* placement = prefs_get_win_placement();
int pos = 1;
for (pos = 1; pos < 4; pos++) {
for (int pos = 1; pos < 4; pos++) {
if (placement->titlebar_pos == pos) {
placement->titlebar_pos = pos + 1;
@@ -1616,8 +1610,7 @@ prefs_mainwin_pos_down(void)
{
ProfWinPlacement* placement = prefs_get_win_placement();
int pos = 1;
for (pos = 1; pos < 4; pos++) {
for (int pos = 1; pos < 4; pos++) {
if (placement->mainwin_pos == pos) {
placement->mainwin_pos = pos + 1;
@@ -1644,8 +1637,7 @@ prefs_statusbar_pos_down(void)
{
ProfWinPlacement* placement = prefs_get_win_placement();
int pos = 1;
for (pos = 1; pos < 4; pos++) {
for (int pos = 1; pos < 4; pos++) {
if (placement->statusbar_pos == pos) {
placement->statusbar_pos = pos + 1;
@@ -1672,8 +1664,7 @@ prefs_inputwin_pos_down(void)
{
ProfWinPlacement* placement = prefs_get_win_placement();
int pos = 1;
for (pos = 1; pos < 4; pos++) {
for (int pos = 1; pos < 4; pos++) {
if (placement->inputwin_pos == pos) {
placement->inputwin_pos = pos + 1;
@@ -1741,8 +1732,8 @@ prefs_get_aliases(void)
GList* result = NULL;
gsize len;
gchar** keys = g_key_file_get_keys(prefs, PREF_GROUP_ALIAS, &len, NULL);
int i;
for (i = 0; i < len; i++) {
for (int i = 0; i < len; i++) {
char* name = keys[i];
char* value = g_key_file_get_string(prefs, PREF_GROUP_ALIAS, name, NULL);

11
src/config/tlscerts.c
View File

@@ -71,8 +71,7 @@ tlscerts_init(void)
gsize len = 0;
gchar** groups = g_key_file_get_groups(tlscerts, &len);
int i = 0;
for (i = 0; i < g_strv_length(groups); i++) {
for (int i = 0; i < g_strv_length(groups); i++) {
autocomplete_add(certs_ac, groups[i]);
}
g_strfreev(groups);
@@ -117,8 +116,7 @@ tlscerts_list(void)
gsize len = 0;
gchar** groups = g_key_file_get_groups(tlscerts, &len);
int i = 0;
for (i = 0; i < g_strv_length(groups); i++) {
for (int i = 0; i < g_strv_length(groups); i++) {
char* fingerprint = strdup(groups[i]);
int version = g_key_file_get_integer(tlscerts, fingerprint, "version", NULL);
char* serialnumber = g_key_file_get_string(tlscerts, fingerprint, "serialnumber", NULL);
@@ -209,8 +207,7 @@ tlscerts_new(const char* const fingerprint, int version, const char* const seria
cert->subject_organisation_unit = NULL;
cert->subject_email = NULL;
gchar** fields = g_strsplit(subjectname, "/", 0);
int i = 0;
for (i = 0; i < g_strv_length(fields); i++) {
for (int i = 0; i < g_strv_length(fields); i++) {
gchar** keyval = g_strsplit(fields[i], "=", 2);
if (g_strv_length(keyval) == 2) {
if ((g_strcmp0(keyval[0], "C") == 0) || (g_strcmp0(keyval[0], "countryName") == 0)) {
@@ -251,7 +248,7 @@ tlscerts_new(const char* const fingerprint, int version, const char* const seria
cert->issuer_organisation_unit = NULL;
cert->issuer_email = NULL;
fields = g_strsplit(issuername, "/", 0);
for (i = 0; i < g_strv_length(fields); i++) {
for (int i = 0; i < g_strv_length(fields); i++) {
gchar** keyval = g_strsplit(fields[i], "=", 2);
if (g_strv_length(keyval) == 2) {
if ((g_strcmp0(keyval[0], "C") == 0) || (g_strcmp0(keyval[0], "countryName") == 0)) {