summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cli/cli.c3
-rw-r--r--src/daemon/abrt-action-save-package-data.c10
-rw-r--r--src/gui-wizard-gtk/wizard.c15
-rw-r--r--src/lib/abrt_dbus.c3
-rw-r--r--src/lib/event_config.c10
-rw-r--r--src/lib/event_xml_parser.c3
-rw-r--r--src/lib/glib_support.c3
-rw-r--r--src/plugins/abrt-retrace-client.c9
8 files changed, 38 insertions, 18 deletions
diff --git a/src/cli/cli.c b/src/cli/cli.c
index 0c895a76..0af9ef2b 100644
--- a/src/cli/cli.c
+++ b/src/cli/cli.c
@@ -116,7 +116,8 @@ static void print_crash(crash_data_t *crash_data)
*/
static void print_crash_list(vector_of_crash_data_t *crash_list, bool include_reported)
{
- for (unsigned i = 0; i < crash_list->len; ++i)
+ unsigned i;
+ for (i = 0; i < crash_list->len; ++i)
{
crash_data_t *crash = get_crash_data(crash_list, i);
if (!include_reported)
diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c
index 34905b60..e58b4254 100644
--- a/src/daemon/abrt-action-save-package-data.c
+++ b/src/daemon/abrt-action-save-package-data.c
@@ -64,7 +64,8 @@ static char *get_argv1_if_full_path(const char* cmdline)
static bool is_path_blacklisted(const char *path)
{
- for (GList *li = g_settings_setBlackListedPaths; li != NULL; li = g_list_next(li))
+ GList *li;
+ for (li = g_settings_setBlackListedPaths; li != NULL; li = g_list_next(li))
{
if (fnmatch((char*)li->data, path, /*flags:*/ 0) == 0)
{
@@ -184,7 +185,9 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
package_short_name = get_package_name_from_NVR_or_NULL(package_full_name);
VERB2 log("Package:'%s' short:'%s'", package_full_name, package_short_name);
- for (GList *li = g_settings_setBlackListedPkgs; li != NULL; li = g_list_next(li))
+ GList *li;
+
+ for (li = g_settings_setBlackListedPkgs; li != NULL; li = g_list_next(li))
{
if (strcmp((char*)li->data, package_short_name) == 0)
{
@@ -278,7 +281,8 @@ int main(int argc, char **argv)
VERB1 log("Initializing rpm library");
rpm_init();
- for (GList *li = g_settings_setOpenGPGPublicKeys; li != NULL; li = g_list_next(li))
+ GList *li;
+ for (li = g_settings_setOpenGPGPublicKeys; li != NULL; li = g_list_next(li))
{
VERB1 log("Loading GPG key '%s'", (char*)li->data);
rpm_load_gpgkey((char*)li->data);
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
index 33a69110..f23be58f 100644
--- a/src/gui-wizard-gtk/wizard.c
+++ b/src/gui-wizard-gtk/wizard.c
@@ -551,7 +551,8 @@ void update_gui_state_from_crash_data(void)
/* Update reporter checkboxes */
/* Remember names of selected reporters */
GList *old_reporters = gtk_container_get_children(GTK_CONTAINER(g_box_reporters));
- for (GList *li = old_reporters; li; li = li->next)
+ GList *li;
+ for (li = old_reporters; li; li = li->next)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(li->data)) == TRUE)
li->data = xstrdup(gtk_button_get_label(GTK_BUTTON(li->data)));
@@ -563,11 +564,13 @@ void update_gui_state_from_crash_data(void)
add_event_buttons(g_box_reporters, g_report_events, /*callback:*/ G_CALLBACK(report_tb_was_toggled), /*radio:*/ false, /*prev:*/ NULL);
/* Re-select new reporters which were selected before we deleted them */
GList *new_reporters = gtk_container_get_children(GTK_CONTAINER(g_box_reporters));
- for (GList *li_new = new_reporters; li_new; li_new = li_new->next)
+ GList *li_new;
+ for (li_new = new_reporters; li_new; li_new = li_new->next)
{
const char *new_name = gtk_button_get_label(GTK_BUTTON(li_new->data));
+ GList *li_old;
- for (GList *li_old = old_reporters; li_old; li_old = li_old->next)
+ for (li_old = old_reporters; li_old; li_old = li_old->next)
{
if (strcmp(new_name, li_old->data) == 0)
{
@@ -1022,7 +1025,8 @@ static void next_page(GtkAssistant *assistant, gpointer user_data)
GList *reporters = gtk_container_get_children(GTK_CONTAINER(g_box_reporters));
if (reporters)
{
- for (GList *li = reporters; li; li = li->next)
+ GList *li;
+ for (li = reporters; li; li = li->next)
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(li->data)) == TRUE)
/* Button's tooltip contains event_name */
@@ -1210,7 +1214,8 @@ static void add_pages(void)
error_msg_and_die("Can't load %s: %s", g_glade_file, error->message);
}
- for (int i = 0; page_names[i] != NULL; i++)
+ int i;
+ for (i = 0; page_names[i] != NULL; i++)
{
GtkWidget *page = GTK_WIDGET(gtk_builder_get_object(builder, page_names[i]));
if (page == NULL)
diff --git a/src/lib/abrt_dbus.c b/src/lib/abrt_dbus.c
index a4bab15f..51962243 100644
--- a/src/lib/abrt_dbus.c
+++ b/src/lib/abrt_dbus.c
@@ -232,12 +232,13 @@ void store_crash_data(DBusMessageIter* dbus_iter, crash_data_t *val)
void store_vector_of_crash_data(DBusMessageIter* iter, vector_of_crash_data_t *val)
{
DBusMessageIter sub_iter;
+ unsigned i;
/* "array of maps". map in dbus is an array ("a") of two element structs "({...})":
* "s" (string) for key and "as" for value (in this case, array of strings) */
if (!dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "a{sas}", &sub_iter))
die_out_of_memory();
- for (unsigned i = 0; i < val->len; i++)
+ for (i = 0; i < val->len; i++)
{
crash_data_t *crash_data = get_crash_data(val, i);
store_crash_data(&sub_iter, crash_data);
diff --git a/src/lib/event_config.c b/src/lib/event_config.c
index 4e14c79a..a84aae0c 100644
--- a/src/lib/event_config.c
+++ b/src/lib/event_config.c
@@ -45,13 +45,15 @@ void free_event_option(event_option_t *p)
void free_event_config(event_config_t *p)
{
+ GList *opt;
+
if (!p)
return;
free(p->screen_name);
//free(p->title);
//free(p->action);
free(p->description);
- for (GList *opt = p->options; opt; opt = opt->next)
+ for (opt = p->options; opt; opt = opt->next)
free_event_option(opt->data);
g_list_free(p->options);
free(p);
@@ -254,7 +256,8 @@ GList *export_event_config(const char *event_name)
event_config_t *config = get_event_config(event_name);
if (config)
{
- for (GList *lopt = config->options; lopt; lopt = lopt->next)
+ GList *lopt;
+ for (lopt = config->options; lopt; lopt = lopt->next)
{
event_option_t *opt = lopt->data;
if (!opt->value)
@@ -289,8 +292,9 @@ GHashTable *validate_event(const char *event_name)
GHashTable *errors = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
+ GList *li;
- for (GList *li = config->options; li; li = li->next)
+ for (li = config->options; li; li = li->next)
{
event_option_t *opt = (event_option_t *)li->data;
char *err = validate_event_option(opt);
diff --git a/src/lib/event_xml_parser.c b/src/lib/event_xml_parser.c
index 74329134..a6aa9a1f 100644
--- a/src/lib/event_xml_parser.c
+++ b/src/lib/event_xml_parser.c
@@ -111,8 +111,9 @@ static void start_element(GMarkupParseContext *context,
}
event_option_t *opt = parse_data->cur_option = new_event_option();
+ int i;
- for (int i = 0; attribute_names[i] != NULL; ++i)
+ for (i = 0; attribute_names[i] != NULL; ++i)
{
VERB2 log("attr: %s:%s", attribute_names[i], attribute_values[i]);
if (strcmp(attribute_names[i], "name") == 0)
diff --git a/src/lib/glib_support.c b/src/lib/glib_support.c
index feb4c18b..fc4d364e 100644
--- a/src/lib/glib_support.c
+++ b/src/lib/glib_support.c
@@ -20,7 +20,8 @@
void list_free_with_free(GList *list)
{
- for (GList *li = list; li; li = g_list_next(li))
+ GList *li;
+ for (li = list; li; li = g_list_next(li))
free(li->data);
g_list_free(list);
}
diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c
index da11a161..005a03f0 100644
--- a/src/plugins/abrt-retrace-client.c
+++ b/src/plugins/abrt-retrace-client.c
@@ -362,9 +362,10 @@ static int http_get_response_code(const char *message)
static void http_print_headers(FILE *file, const char *message)
{
const char *headers_end = strstr(message, "\r\n\r\n");
+ const char *c;
if (!headers_end)
headers_end = message + strlen(message);
- for (const char *c = message; c != headers_end + 2; ++c)
+ for (c = message; c != headers_end + 2; ++c)
{
if (*c == '\r')
continue;
@@ -575,7 +576,8 @@ static void backtrace(const char *task_id, const char *task_password,
* '\r' characters are not copied to the backtrace. */
*backtrace = xmalloc(length);
char *b = *backtrace;
- for (char *c = headers_end + strlen("\r\n\r\n"); *c; ++c)
+ char *c;
+ for (c = headers_end + strlen("\r\n\r\n"); *c; ++c)
{
if (*c == '\r')
continue;
@@ -625,9 +627,10 @@ static void run_log(const char *task_id, const char *task_password)
response_code, http_response);
}
char *headers_end = strstr(http_response, "\r\n\r\n");
+ char *c;
if (!headers_end)
error_msg_and_die("Invalid response from server: missing HTTP message body.");
- for (char *c = headers_end + 4; *c; ++c)
+ for (c = headers_end + 4; *c; ++c)
{
if (*c == '\r')
continue;
generated by cgit (git 2.34.1) at 2024-04-25 10:01:51 +0000