luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 14:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

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

	* gfileutils.[ch]: template is a reserved word in
	C++ s/template/tmpl/.
This commit is contained in:
Owen Taylor 2000-11-12 20:38:19 +00:00 committed by Owen Taylor
parent 96b9935a7c
commit 91d5e23f5f
12 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2000-11-11 Havoc Pennington <hp@pobox.com>
* gmarkup.c (g_markup_parse_context_parse): Handle a long stream * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

5
ChangeLog.pre-2-0
View File

@ -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> 2000-11-11 Havoc Pennington <hp@pobox.com>
* gmarkup.c (g_markup_parse_context_parse): Handle a long stream * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

5
ChangeLog.pre-2-10
View File

@ -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> 2000-11-11 Havoc Pennington <hp@pobox.com>
* gmarkup.c (g_markup_parse_context_parse): Handle a long stream * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

5
ChangeLog.pre-2-12
View File

@ -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> 2000-11-11 Havoc Pennington <hp@pobox.com>
* gmarkup.c (g_markup_parse_context_parse): Handle a long stream * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

5
ChangeLog.pre-2-2
View File

@ -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> 2000-11-11 Havoc Pennington <hp@pobox.com>
* gmarkup.c (g_markup_parse_context_parse): Handle a long stream * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

5
ChangeLog.pre-2-4
View File

@ -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> 2000-11-11 Havoc Pennington <hp@pobox.com>
* gmarkup.c (g_markup_parse_context_parse): Handle a long stream * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

5
ChangeLog.pre-2-6
View File

@ -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> 2000-11-11 Havoc Pennington <hp@pobox.com>
* gmarkup.c (g_markup_parse_context_parse): Handle a long stream * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

5
ChangeLog.pre-2-8
View File

@ -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> 2000-11-11 Havoc Pennington <hp@pobox.com>
* gmarkup.c (g_markup_parse_context_parse): Handle a long stream * gmarkup.c (g_markup_parse_context_parse): Handle a long stream

24
gfileutils.c
View File

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

2
gfileutils.h
View File

@ -84,7 +84,7 @@ gboolean g_file_get_contents (const gchar *filename,
int g_mkstemp (char *tmpl); int g_mkstemp (char *tmpl);
/* Wrapper for g_mkstemp */ /* Wrapper for g_mkstemp */
int g_file_open_tmp (const char *template, int g_file_open_tmp (const char *tmpl,
char **name_used, char **name_used,
GError **error); GError **error);

24
glib/gfileutils.c
View File

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

2
glib/gfileutils.h
View File

@ -84,7 +84,7 @@ gboolean g_file_get_contents (const gchar *filename,
int g_mkstemp (char *tmpl); int g_mkstemp (char *tmpl);
/* Wrapper for g_mkstemp */ /* Wrapper for g_mkstemp */
int g_file_open_tmp (const char *template, int g_file_open_tmp (const char *tmpl,
char **name_used, char **name_used,
GError **error); GError **error);