From 1d6c73d49579c3bd9fecac3a66aa436571354b04 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Fri, 11 Nov 2005 06:01:27 +0000 Subject: [PATCH] Fix a couple of gcc4 warnings. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11904 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 5 +++++ lib/glib26/gkeyfile.c | 2 +- lib/glib26/gutils26.c | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a8f76dd7a..2d5947c2ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-11 David Hampton + + * lib/glib26/gkeyfile.c: + * lib/glib26/gutils26.c: Fix a couple of gcc4 warnings. + 2005-11-10 David Hampton * src/core-utils/gnc-gkeyfile-utils.[ch]: diff --git a/lib/glib26/gkeyfile.c b/lib/glib26/gkeyfile.c index 779b72d2fe..8bb5ee8c92 100644 --- a/lib/glib26/gkeyfile.c +++ b/lib/glib26/gkeyfile.c @@ -602,7 +602,7 @@ g_key_file_load_from_data_dirs (GKeyFile *key_file, const gchar * user_data_dir; const gchar * const * system_data_dirs; gsize i, j; - gchar *output_path; + gchar *output_path = NULL; gint fd; gboolean found_file; diff --git a/lib/glib26/gutils26.c b/lib/glib26/gutils26.c index 09d45ac215..93384dd350 100644 --- a/lib/glib26/gutils26.c +++ b/lib/glib26/gutils26.c @@ -751,10 +751,10 @@ _g_compute_locale_variants (const gchar *locale) { GSList *retval = NULL; - gchar *language; - gchar *territory; - gchar *codeset; - gchar *modifier; + gchar *language = NULL; + gchar *territory = NULL; + gchar *codeset = NULL; + gchar *modifier = NULL; guint mask; guint i;