[template-glib] cleanup some clang warnings



commit 563d197d797ec803209f52eb9a2fddbcc524e516
Author: Christian Hergert <chergert redhat com>
Date:   Sun Jan 17 21:48:41 2016 -0800

    cleanup some clang warnings

 src/tmpl-expr-eval.c           |    2 +-
 src/tmpl-expr-parser-private.h |    3 +--
 src/tmpl-expr-parser.y         |   14 +++-----------
 src/tmpl-expr.c                |    6 +++---
 4 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/src/tmpl-expr-eval.c b/src/tmpl-expr-eval.c
index 0b7ac5e..bfa05ea 100644
--- a/src/tmpl-expr-eval.c
+++ b/src/tmpl-expr-eval.c
@@ -619,7 +619,7 @@ tmpl_expr_gi_call_eval (TmplExprGiCall  *node,
     }
 
   if (!g_function_info_invoke (function,
-                               (GIArgument *)in_args->data,
+                               (GIArgument *)(void *)in_args->data,
                                in_args->len,
                                NULL,
                                0,
diff --git a/src/tmpl-expr-parser-private.h b/src/tmpl-expr-parser-private.h
index d021ecf..a642657 100644
--- a/src/tmpl-expr-parser-private.h
+++ b/src/tmpl-expr-parser-private.h
@@ -36,8 +36,7 @@ typedef struct
 void     tmpl_expr_parser_destroy      (TmplExprParser  *parser);
 void     tmpl_expr_parser_flush        (TmplExprParser  *parser);
 void     tmpl_expr_parser_error        (TmplExprParser  *parser,
-                                        const char      *msg,
-                                        ...);
+                                        const char      *message);
 gboolean tmpl_expr_parser_parse_string (TmplExprParser  *parser,
                                         const gchar     *input,
                                         GError         **error);
diff --git a/src/tmpl-expr-parser.y b/src/tmpl-expr-parser.y
index 1ed01c1..721e812 100644
--- a/src/tmpl-expr-parser.y
+++ b/src/tmpl-expr-parser.y
@@ -31,23 +31,15 @@ int tmpl_expr_parser_lex (YYSTYPE *, void *scanner);
 
 void
 tmpl_expr_parser_error (TmplExprParser *parser,
-                        const gchar    *message,
-                        ...)
+                        const gchar    *message)
 {
-  va_list args;
-  gchar *str = NULL;
-
   g_assert (parser != NULL);
   g_assert (message != NULL);
 
-  va_start (args, message);
-  g_vasprintf (&str, message, args);
-  va_end (args);
-
   g_clear_pointer (&parser->ast, tmpl_expr_unref);
 
-  g_clear_pointer (&parser->error_str, g_free);
-  parser->error_str = str;
+  g_free (parser->error_str);
+  parser->error_str = g_strdup (message);
 }
 
 # define scanner parser->scanner
diff --git a/src/tmpl-expr.c b/src/tmpl-expr.c
index aa87e5d..4605ba4 100644
--- a/src/tmpl-expr.c
+++ b/src/tmpl-expr.c
@@ -145,12 +145,12 @@ tmpl_expr_destroy (TmplExpr *self)
 TmplExpr *
 tmpl_expr_new_boolean (gboolean value)
 {
-  TmplExprBoolean *ret;
+  TmplExpr *ret;
 
   ret = tmpl_expr_new (TMPL_EXPR_BOOLEAN);
-  ret->value = value;
+  ((TmplExprBoolean *)ret)->value = !!value;
 
-  return (TmplExpr *)ret;
+  return ret;
 }
 
 TmplExpr *


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]