From b25638b8b13ffa833414c6a7c48fffdac12eda61 Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Fri, 9 Apr 2021 00:17:29 +0200 Subject: Avoid potential conflicts with the global errno variable. --- src/gui/panels/errors.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gui/panels/errors.c b/src/gui/panels/errors.c index 2b5353f..873c939 100644 --- a/src/gui/panels/errors.c +++ b/src/gui/panels/errors.c @@ -94,8 +94,8 @@ typedef enum _ErrorTreeColumn ETC_VISIBLE, /* Correspondance établie ? */ ETC_ORIGIN, /* Source du soucis remonté */ - ETC_ERRNO, /* Code d'erreur associé */ - ETC_ADDR /* Position représentée */ + ETC_ERROR_TYPE, /* Code d'erreur associé */ + ETC_ADDRESS /* Position représentée */ } BinaryTreeColumn; @@ -296,8 +296,8 @@ static void g_error_panel_init(GErrorPanel *panel) builder = gtk_built_named_widget_get_builder(GTK_BUILT_NAMED_WIDGET(pitem->widget)); store = GTK_TREE_SORTABLE(gtk_builder_get_object(builder, "store")); - gtk_tree_sortable_set_sort_func(store, ETC_ADDR, sort_errors_in_panel, NULL, NULL); - gtk_tree_sortable_set_sort_column_id(store, ETC_ADDR, GTK_SORT_ASCENDING); + gtk_tree_sortable_set_sort_func(store, ETC_ADDRESS, sort_errors_in_panel, NULL, NULL); + gtk_tree_sortable_set_sort_column_id(store, ETC_ADDRESS, GTK_SORT_ASCENDING); filter = GTK_TREE_MODEL_FILTER(gtk_builder_get_object(builder, "filter")); gtk_tree_model_filter_set_visible_column(filter, ETC_VISIBLE); @@ -503,8 +503,8 @@ static gint sort_errors_in_panel(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIte vmpa2t *addr_a; /* Localisation de A */ vmpa2t *addr_b; /* Localisation de B */ - gtk_tree_model_get(model, a, ETC_ADDR, &addr_a, -1); - gtk_tree_model_get(model, b, ETC_ADDR, &addr_b, -1); + gtk_tree_model_get(model, a, ETC_ADDRESS, &addr_a, -1); + gtk_tree_model_get(model, b, ETC_ADDRESS, &addr_b, -1); result = cmp_vmpa(addr_a, addr_b); @@ -762,8 +762,8 @@ static void update_error_panel(const GErrorPanel *panel, GtkStatusStack *status, ETC_DESC, e->desc, ETC_VISIBLE, state, ETC_ORIGIN, fmt, - ETC_ERRNO, e->type, - ETC_ADDR, &e->addr, + ETC_ERROR_TYPE, e->type, + ETC_ADDRESS, &e->addr, -1); if (state) @@ -877,7 +877,7 @@ static void filter_error_panel(const GErrorPanel *panel, GtkStatusStack *status, GtkTreeIter iter; /* Boucle de parcours */ gboolean valid; /* Validité du point courant */ gboolean format; /* Origine du soucis remonté */ - guint errno; /* Code d'erreur associé */ + guint error_type; /* Code d'erreur associé */ gboolean state; /* Bilan d'un filtrage */ builder = gtk_built_named_widget_get_builder(GTK_BUILT_NAMED_WIDGET(G_PANEL_ITEM(panel)->widget)); @@ -931,9 +931,9 @@ static void filter_error_panel(const GErrorPanel *panel, GtkStatusStack *status, valid; valid = gtk_tree_model_iter_next(store, &iter)) { - gtk_tree_model_get(store, &iter, ETC_ORIGIN, &format, ETC_ERRNO, &errno, -1); + gtk_tree_model_get(store, &iter, ETC_ORIGIN, &format, ETC_ERROR_TYPE, &error_type, -1); - state = is_error_visible(format, errno); + state = is_error_visible(format, error_type); gtk_list_store_set(GTK_LIST_STORE(store), &iter, ETC_VISIBLE, state, @@ -1014,7 +1014,7 @@ static void on_error_selection_changed(GtkTreeSelection *selection, gpointer unu if (gtk_tree_selection_get_selected(selection, &model, &iter)) { - gtk_tree_model_get(model, &iter, ETC_ADDR, &addr, -1); + gtk_tree_model_get(model, &iter, ETC_ADDRESS, &addr, -1); if (addr != NULL) { -- cgit v0.11.2-87-g4458