template is a reserved word in C++ s/template/tmpl/.

Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>

	* gfileutils.[ch]: template is a reserved word in
	C++ s/template/tmpl/.

diff --git a/ChangeLog b/ChangeLog
index 0b6cae3b398a704f514d7a3506611ab49c0d149c..200ce8311fc0c136db3e7928e02ad7da030c626d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gfileutils.[ch]: template is a reserved word in
+       C++ s/template/tmpl/. 
+
 2000-11-11  Havoc Pennington  <hp@pobox.com>
 
        * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0b6cae3b398a704f514d7a3506611ab49c0d149c..200ce8311fc0c136db3e7928e02ad7da030c626d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gfileutils.[ch]: template is a reserved word in
+       C++ s/template/tmpl/. 
+
 2000-11-11  Havoc Pennington  <hp@pobox.com>
 
        * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0b6cae3b398a704f514d7a3506611ab49c0d149c..200ce8311fc0c136db3e7928e02ad7da030c626d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gfileutils.[ch]: template is a reserved word in
+       C++ s/template/tmpl/. 
+
 2000-11-11  Havoc Pennington  <hp@pobox.com>
 
        * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0b6cae3b398a704f514d7a3506611ab49c0d149c..200ce8311fc0c136db3e7928e02ad7da030c626d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gfileutils.[ch]: template is a reserved word in
+       C++ s/template/tmpl/. 
+
 2000-11-11  Havoc Pennington  <hp@pobox.com>
 
        * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0b6cae3b398a704f514d7a3506611ab49c0d149c..200ce8311fc0c136db3e7928e02ad7da030c626d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gfileutils.[ch]: template is a reserved word in
+       C++ s/template/tmpl/. 
+
 2000-11-11  Havoc Pennington  <hp@pobox.com>
 
        * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0b6cae3b398a704f514d7a3506611ab49c0d149c..200ce8311fc0c136db3e7928e02ad7da030c626d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gfileutils.[ch]: template is a reserved word in
+       C++ s/template/tmpl/. 
+
 2000-11-11  Havoc Pennington  <hp@pobox.com>
 
        * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0b6cae3b398a704f514d7a3506611ab49c0d149c..200ce8311fc0c136db3e7928e02ad7da030c626d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gfileutils.[ch]: template is a reserved word in
+       C++ s/template/tmpl/. 
+
 2000-11-11  Havoc Pennington  <hp@pobox.com>
 
        * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0b6cae3b398a704f514d7a3506611ab49c0d149c..200ce8311fc0c136db3e7928e02ad7da030c626d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Nov 12 15:29:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gfileutils.[ch]: template is a reserved word in
+       C++ s/template/tmpl/. 
+
 2000-11-11  Havoc Pennington  <hp@pobox.com>
 
        * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

diff --git a/gfileutils.c b/gfileutils.c
index b897e1b0a950ca1c76abdb92e7b800f8c34b6f71..e1a870b9d2de50b16486711e5df516621318a57a 100644 (file)
--- a/gfileutils.c
+++ b/gfileutils.c
@@ -586,20 +586,20 @@ g_mkstemp (char *tmpl)
 
 /**
  * g_file_open_tmp:
- * @template: Template for file name, as in g_mkstemp, basename only
+ * @tmpl: Template for file name, as in g_mkstemp, basename only
  * @name_used: location to store actual name used
  * @error: return location for a #GError
  *
  * Opens a file for writing in the preferred directory for temporary
  * files (as returned by g_get_tmp_dir()). 
  *
- * @template should be a string ending with six 'X' characters, as the
+ * @tmpl should be a string ending with six 'X' characters, as the
  * parameter to g_mkstemp() (or mkstemp()). However, unlike these
  * functions, the template should only be a basename, no directory
  * components are allowed. If template is NULL, a default template is
  * used.
  *
- * Note that in contrast to g_mkstemp() (and mkstemp()) @template is not
+ * Note that in contrast to g_mkstemp() (and mkstemp()) @tmpl is not
  * modified, and might thus be a read-only literal string.
  *
  * The actual name used is returned in @name_used if non-NULL. This
@@ -610,7 +610,7 @@ g_mkstemp (char *tmpl)
  * g_mkstemp() is returned.
  **/
 int
-g_file_open_tmp (const char *template,
+g_file_open_tmp (const char *tmpl,
                 char      **name_used,
                 GError    **error)
 {
@@ -619,28 +619,28 @@ g_file_open_tmp (const char *template,
   char *sep;
   char *fulltemplate;
 
-  if (template == NULL)
-    template = ".XXXXXX";
+  if (tmpl == NULL)
+    tmpl = ".XXXXXX";
 
-  if (strchr (template, G_DIR_SEPARATOR))
+  if (strchr (tmpl, G_DIR_SEPARATOR))
     {
       g_set_error (error,
                   G_FILE_ERROR,
                   G_FILE_ERROR_FAILED,
                   _("Template '%s' illegal, should not contain a '%s'"),
-                  template, G_DIR_SEPARATOR_S);
+                  tmpl, G_DIR_SEPARATOR_S);
 
       return -1;
     }
   
-  if (strlen (template) < 6 ||
-      strcmp (template + strlen (template) - 6, "XXXXXX") != 0)
+  if (strlen (tmpl) < 6 ||
+      strcmp (tmpl + strlen (tmpl) - 6, "XXXXXX") != 0)
     {
       g_set_error (error,
                   G_FILE_ERROR,
                   G_FILE_ERROR_FAILED,
                   _("Template '%s' doesn end with XXXXXX"),
-                  template);
+                  tmpl);
       return -1;
     }
 
@@ -651,7 +651,7 @@ g_file_open_tmp (const char *template,
   else
     sep = G_DIR_SEPARATOR_S;
 
-  fulltemplate = g_strconcat (tmpdir, sep, template, NULL);
+  fulltemplate = g_strconcat (tmpdir, sep, tmpl, NULL);
 
   retval = g_mkstemp (fulltemplate);
 

diff --git a/gfileutils.h b/gfileutils.h
index 0e80543c65cf6850bdcf21dd28a9c1ab8cd394fa..9929ee152bf28e94a25a103a115d39c7157e3ae9 100644 (file)
--- a/gfileutils.h
+++ b/gfileutils.h
@@ -84,7 +84,7 @@ gboolean g_file_get_contents (const gchar  *filename,
 int     g_mkstemp            (char         *tmpl);
 
 /* Wrapper for g_mkstemp */
-int     g_file_open_tmp      (const char   *template,
+int     g_file_open_tmp      (const char   *tmpl,
                              char        **name_used,
                              GError      **error);
 

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index b897e1b0a950ca1c76abdb92e7b800f8c34b6f71..e1a870b9d2de50b16486711e5df516621318a57a 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -586,20 +586,20 @@ g_mkstemp (char *tmpl)
 
 /**
  * g_file_open_tmp:
- * @template: Template for file name, as in g_mkstemp, basename only
+ * @tmpl: Template for file name, as in g_mkstemp, basename only
  * @name_used: location to store actual name used
  * @error: return location for a #GError
  *
  * Opens a file for writing in the preferred directory for temporary
  * files (as returned by g_get_tmp_dir()). 
  *
- * @template should be a string ending with six 'X' characters, as the
+ * @tmpl should be a string ending with six 'X' characters, as the
  * parameter to g_mkstemp() (or mkstemp()). However, unlike these
  * functions, the template should only be a basename, no directory
  * components are allowed. If template is NULL, a default template is
  * used.
  *
- * Note that in contrast to g_mkstemp() (and mkstemp()) @template is not
+ * Note that in contrast to g_mkstemp() (and mkstemp()) @tmpl is not
  * modified, and might thus be a read-only literal string.
  *
  * The actual name used is returned in @name_used if non-NULL. This
@@ -610,7 +610,7 @@ g_mkstemp (char *tmpl)
  * g_mkstemp() is returned.
  **/
 int
-g_file_open_tmp (const char *template,
+g_file_open_tmp (const char *tmpl,
                 char      **name_used,
                 GError    **error)
 {
@@ -619,28 +619,28 @@ g_file_open_tmp (const char *template,
   char *sep;
   char *fulltemplate;
 
-  if (template == NULL)
-    template = ".XXXXXX";
+  if (tmpl == NULL)
+    tmpl = ".XXXXXX";
 
-  if (strchr (template, G_DIR_SEPARATOR))
+  if (strchr (tmpl, G_DIR_SEPARATOR))
     {
       g_set_error (error,
                   G_FILE_ERROR,
                   G_FILE_ERROR_FAILED,
                   _("Template '%s' illegal, should not contain a '%s'"),
-                  template, G_DIR_SEPARATOR_S);
+                  tmpl, G_DIR_SEPARATOR_S);
 
       return -1;
     }
   
-  if (strlen (template) < 6 ||
-      strcmp (template + strlen (template) - 6, "XXXXXX") != 0)
+  if (strlen (tmpl) < 6 ||
+      strcmp (tmpl + strlen (tmpl) - 6, "XXXXXX") != 0)
     {
       g_set_error (error,
                   G_FILE_ERROR,
                   G_FILE_ERROR_FAILED,
                   _("Template '%s' doesn end with XXXXXX"),
-                  template);
+                  tmpl);
       return -1;
     }
 
@@ -651,7 +651,7 @@ g_file_open_tmp (const char *template,
   else
     sep = G_DIR_SEPARATOR_S;
 
-  fulltemplate = g_strconcat (tmpdir, sep, template, NULL);
+  fulltemplate = g_strconcat (tmpdir, sep, tmpl, NULL);
 
   retval = g_mkstemp (fulltemplate);
 

diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index 0e80543c65cf6850bdcf21dd28a9c1ab8cd394fa..9929ee152bf28e94a25a103a115d39c7157e3ae9 100644 (file)
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -84,7 +84,7 @@ gboolean g_file_get_contents (const gchar  *filename,
 int     g_mkstemp            (char         *tmpl);
 
 /* Wrapper for g_mkstemp */
-int     g_file_open_tmp      (const char   *template,
+int     g_file_open_tmp      (const char   *tmpl,
                              char        **name_used,
                              GError      **error);