From 4eeac41d7dd9b75d2d44f5542f70d4f795a34333 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 9 Dec 2011 11:13:23 -0500 Subject: [PATCH] gfile: Don't use C++ keyword "template" as variable name This breaks autotestkeyword.cc from gtk+. --- gio/gfile.c | 8 ++++---- gio/gfile.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gio/gfile.c b/gio/gfile.c index eac2eaf..171cc3f 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -5895,7 +5895,7 @@ g_file_new_for_uri (const char *uri) /** * g_file_new_tmp: - * @template: (type filename) (allow-none): Template for the file + * @tmpl: (type filename) (allow-none): Template for the file * name, as in g_file_open_tmp(), or %NULL for a default template. * @iostream: (out): on return, a #GFileIOStream for the created file. * @error: a #GError, or %NULL @@ -5915,7 +5915,7 @@ g_file_new_for_uri (const char *uri) * Free the returned object with g_object_unref(). **/ GFile * -g_file_new_tmp (const char *template, +g_file_new_tmp (const char *tmpl, GFileIOStream **iostream, GError **error) { @@ -5924,10 +5924,10 @@ g_file_new_tmp (const char *template, GFile *file; GFileOutputStream *output; - g_return_val_if_fail (template != NULL, NULL); + g_return_val_if_fail (tmpl != NULL, NULL); g_return_val_if_fail (iostream != NULL, NULL); - fd = g_file_open_tmp (template, &path, error); + fd = g_file_open_tmp (tmpl, &path, error); if (fd == -1) return NULL; diff --git a/gio/gfile.h b/gio/gfile.h index 0638f23..ea156d1 100644 --- a/gio/gfile.h +++ b/gio/gfile.h @@ -550,7 +550,7 @@ GType g_file_get_type (void) G_GNUC_CONST; GFile * g_file_new_for_path (const char *path); GFile * g_file_new_for_uri (const char *uri); GFile * g_file_new_for_commandline_arg (const char *arg); -GFile * g_file_new_tmp (const char *template, +GFile * g_file_new_tmp (const char *tmpl, GFileIOStream **iostream, GError **error); GFile * g_file_parse_name (const char *parse_name); -- 2.7.4