diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-11-13 19:01:28 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-11-13 19:01:28 +0000 |
| commit | b1376c12d9074db95003f2673f53036b571b52e9 (patch) | |
| tree | 3a5ab2a980c74b6b105bc1b28be75836a95bb86e /glib | |
| parent | 8eb6625370dfbead0fce329355bd07732d0eeda9 (diff) | |
| download | glib-b1376c12d9074db95003f2673f53036b571b52e9.tar.gz | |
Up version to 1.3.2
Mon Nov 13 14:00:20 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Up version to 1.3.2
* gconvert.h (enum GConvertError): Remove trailing ,
* gfileutils.c (g_file_open_tmp): Fix comment to
properly describe return value.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/gconvert.h | 2 | ||||
| -rw-r--r-- | glib/gfileutils.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/glib/gconvert.h b/glib/gconvert.h index b2e959226..ce19b3672 100644 --- a/glib/gconvert.h +++ b/glib/gconvert.h @@ -37,7 +37,7 @@ typedef enum G_CONVERT_ERROR_NO_CONVERSION, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_FAILED, - G_CONVERT_ERROR_PARTIAL_INPUT, + G_CONVERT_ERROR_PARTIAL_INPUT } GConvertError; #define G_CONVERT_ERROR g_convert_error_quark() diff --git a/glib/gfileutils.c b/glib/gfileutils.c index e1a870b9d..47c2ef68a 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -522,7 +522,6 @@ g_file_get_contents (const gchar *filename, * opened for reading and writing. The file is opened in binary mode * on platforms where there is a difference. The file handle should be * closed with close(). In case of errors, -1 is returned. - * */ int g_mkstemp (char *tmpl) @@ -605,9 +604,11 @@ g_mkstemp (char *tmpl) * The actual name used is returned in @name_used if non-NULL. This * string should be freed with g_free when not needed any longer. * - * If some error occurs, @error is set, and -1 is returned. Otherwise, - * the file descriptor to a file opened for reading and writing with - * g_mkstemp() is returned. + * Return value: A file handle (as from open()) to the file + * opened for reading and writing. The file is opened in binary mode + * on platforms where there is a difference. The file handle should be + * closed with close(). In case of errors, -1 is returned and + * @error will be set. **/ int g_file_open_tmp (const char *tmpl, |