[template-glib] eval: use local GError before propagating
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [template-glib] eval: use local GError before propagating
- Date: Wed, 4 May 2022 18:52:17 +0000 (UTC)
commit 73840978174b8627e06f9a00764d5bbddd32787a
Author: Christian Hergert <chergert redhat com>
Date: Wed May 4 11:50:58 2022 -0700
eval: use local GError before propagating
Just makes it easier to debug later on.
src/tmpl-expr-eval.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/src/tmpl-expr-eval.c b/src/tmpl-expr-eval.c
index 7cfc4fa..a5ee4b1 100644
--- a/src/tmpl-expr-eval.c
+++ b/src/tmpl-expr-eval.c
@@ -1183,7 +1183,7 @@ tmpl_expr_require_eval (TmplExprRequire *node,
GError **error)
{
GITypelib *typelib;
- TmplSymbol *symbol;
+ GError *local_error = NULL;
g_assert (node != NULL);
g_assert (scope != NULL);
@@ -1192,19 +1192,20 @@ tmpl_expr_require_eval (TmplExprRequire *node,
typelib = g_irepository_require (g_irepository_get_default (),
node->name,
node->version,
- G_IREPOSITORY_LOAD_FLAG_LAZY,
- error);
+ 0,
+ &local_error);
- g_assert (typelib != NULL || (error == NULL || *error != NULL));
+ g_assert (typelib != NULL || local_error != NULL);
if (typelib == NULL)
- return FALSE;
+ {
+ g_propagate_error (error, local_error);
+ return FALSE;
+ }
g_value_init (return_value, TMPL_TYPE_TYPELIB);
g_value_set_pointer (return_value, typelib);
-
- symbol = tmpl_scope_get (scope, node->name);
- tmpl_symbol_assign_value (symbol, return_value);
+ tmpl_scope_set_value (scope, node->name, return_value);
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]