From 58d0d111af5580051b4d9a5cbaef4d7b96fdcfa8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Mar 2010 10:38:59 -0400 Subject: Prevent future bugs like #612792. Add G_GNUC_NULL_TERMINATED to EAlert functions with variable-length parameter lists and drop the unnecessary "arg0" parameter so the function attribute works correctly. --- e-util/e-alert.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'e-util/e-alert.c') diff --git a/e-util/e-alert.c b/e-util/e-alert.c index b3a7859da5..3c7aca3ee1 100644 --- a/e-util/e-alert.c +++ b/e-util/e-alert.c @@ -499,25 +499,25 @@ e_alert_init (EAlert *self) * Returns: a new #EAlert **/ EAlert * -e_alert_new(const gchar *tag, const gchar *arg0, ...) +e_alert_new(const gchar *tag, ...) { EAlert *e; va_list ap; - va_start(ap, arg0); - e = e_alert_new_valist(tag, arg0, ap); + va_start(ap, tag); + e = e_alert_new_valist(tag, ap); va_end(ap); return e; } EAlert * -e_alert_new_valist(const gchar *tag, const gchar *arg0, va_list ap) +e_alert_new_valist(const gchar *tag, va_list ap) { gchar *tmp; GPtrArray *args = g_ptr_array_new_with_free_func (g_free); - tmp = (gchar *)arg0; + tmp = va_arg (ap, gchar *); while (tmp) { g_ptr_array_add(args, g_strdup (tmp)); tmp = va_arg(ap, gchar *); -- cgit v1.2.3