fix indentation (GConvertError): generic error is conventionally called

2000-09-28  Havoc Pennington  <hp@pobox.com>

* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.

* gconvert.c: s/_OTHER/_FAILED/
This commit is contained in:
Havoc Pennington 2000-09-29 02:56:43 +00:00 committed by Havoc Pennington
parent b4f692999f
commit 349eaa6a25
12 changed files with 88 additions and 16 deletions

View File

@ -1,3 +1,12 @@
2000-09-28 Havoc Pennington <hp@pobox.com>
* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.
* gconvert.c: s/_OTHER/_FAILED/
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Adjusted the test for an unimplemented * configure.in: Adjusted the test for an unimplemented

View File

@ -1,3 +1,12 @@
2000-09-28 Havoc Pennington <hp@pobox.com>
* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.
* gconvert.c: s/_OTHER/_FAILED/
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Adjusted the test for an unimplemented * configure.in: Adjusted the test for an unimplemented

View File

@ -1,3 +1,12 @@
2000-09-28 Havoc Pennington <hp@pobox.com>
* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.
* gconvert.c: s/_OTHER/_FAILED/
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Adjusted the test for an unimplemented * configure.in: Adjusted the test for an unimplemented

View File

@ -1,3 +1,12 @@
2000-09-28 Havoc Pennington <hp@pobox.com>
* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.
* gconvert.c: s/_OTHER/_FAILED/
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Adjusted the test for an unimplemented * configure.in: Adjusted the test for an unimplemented

View File

@ -1,3 +1,12 @@
2000-09-28 Havoc Pennington <hp@pobox.com>
* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.
* gconvert.c: s/_OTHER/_FAILED/
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Adjusted the test for an unimplemented * configure.in: Adjusted the test for an unimplemented

View File

@ -1,3 +1,12 @@
2000-09-28 Havoc Pennington <hp@pobox.com>
* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.
* gconvert.c: s/_OTHER/_FAILED/
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Adjusted the test for an unimplemented * configure.in: Adjusted the test for an unimplemented

View File

@ -1,3 +1,12 @@
2000-09-28 Havoc Pennington <hp@pobox.com>
* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.
* gconvert.c: s/_OTHER/_FAILED/
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Adjusted the test for an unimplemented * configure.in: Adjusted the test for an unimplemented

View File

@ -1,3 +1,12 @@
2000-09-28 Havoc Pennington <hp@pobox.com>
* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.
* gconvert.c: s/_OTHER/_FAILED/
2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-28 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Adjusted the test for an unimplemented * configure.in: Adjusted the test for an unimplemented

View File

@ -50,7 +50,7 @@ open_converter (const gchar *to_codeset,
"Conversion from character set `%s' to `%s' is not supported", "Conversion from character set `%s' to `%s' is not supported",
from_codeset, to_codeset); from_codeset, to_codeset);
else else
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER, g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
"Could not open converter from `%s' to `%s': %s", "Could not open converter from `%s' to `%s': %s",
from_codeset, to_codeset, strerror (errno)); from_codeset, to_codeset, strerror (errno));
} }
@ -155,7 +155,7 @@ g_convert (const gchar *str,
have_error = TRUE; have_error = TRUE;
break; break;
default: default:
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER, g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
"Error during conversion: %s", "Error during conversion: %s",
strerror (errno)); strerror (errno));
have_error = TRUE; have_error = TRUE;
@ -353,7 +353,7 @@ g_convert_with_fallback (const gchar *str,
} }
break; break;
default: default:
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER, g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
"Error during conversion: %s", "Error during conversion: %s",
strerror (errno)); strerror (errno));
have_error = TRUE; have_error = TRUE;

10
glib.h
View File

@ -3079,10 +3079,10 @@ typedef void (*GThreadFunc) (gpointer value);
typedef enum typedef enum
{ {
G_THREAD_PRIORITY_LOW, G_THREAD_PRIORITY_LOW,
G_THREAD_PRIORITY_NORMAL, G_THREAD_PRIORITY_NORMAL,
G_THREAD_PRIORITY_HIGH, G_THREAD_PRIORITY_HIGH,
G_THREAD_PRIORITY_URGENT G_THREAD_PRIORITY_URGENT
} GThreadPriority; } GThreadPriority;
typedef struct _GThread GThread; typedef struct _GThread GThread;
@ -3442,7 +3442,7 @@ typedef enum
{ {
G_CONVERT_ERROR_NO_CONVERSION, G_CONVERT_ERROR_NO_CONVERSION,
G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
G_CONVERT_ERROR_OTHER G_CONVERT_ERROR_FAILED
} GConvertError; } GConvertError;
#define G_CONVERT_ERROR g_convert_error_quark() #define G_CONVERT_ERROR g_convert_error_quark()

View File

@ -50,7 +50,7 @@ open_converter (const gchar *to_codeset,
"Conversion from character set `%s' to `%s' is not supported", "Conversion from character set `%s' to `%s' is not supported",
from_codeset, to_codeset); from_codeset, to_codeset);
else else
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER, g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
"Could not open converter from `%s' to `%s': %s", "Could not open converter from `%s' to `%s': %s",
from_codeset, to_codeset, strerror (errno)); from_codeset, to_codeset, strerror (errno));
} }
@ -155,7 +155,7 @@ g_convert (const gchar *str,
have_error = TRUE; have_error = TRUE;
break; break;
default: default:
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER, g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
"Error during conversion: %s", "Error during conversion: %s",
strerror (errno)); strerror (errno));
have_error = TRUE; have_error = TRUE;
@ -353,7 +353,7 @@ g_convert_with_fallback (const gchar *str,
} }
break; break;
default: default:
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER, g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
"Error during conversion: %s", "Error during conversion: %s",
strerror (errno)); strerror (errno));
have_error = TRUE; have_error = TRUE;

View File

@ -3079,10 +3079,10 @@ typedef void (*GThreadFunc) (gpointer value);
typedef enum typedef enum
{ {
G_THREAD_PRIORITY_LOW, G_THREAD_PRIORITY_LOW,
G_THREAD_PRIORITY_NORMAL, G_THREAD_PRIORITY_NORMAL,
G_THREAD_PRIORITY_HIGH, G_THREAD_PRIORITY_HIGH,
G_THREAD_PRIORITY_URGENT G_THREAD_PRIORITY_URGENT
} GThreadPriority; } GThreadPriority;
typedef struct _GThread GThread; typedef struct _GThread GThread;
@ -3442,7 +3442,7 @@ typedef enum
{ {
G_CONVERT_ERROR_NO_CONVERSION, G_CONVERT_ERROR_NO_CONVERSION,
G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
G_CONVERT_ERROR_OTHER G_CONVERT_ERROR_FAILED
} GConvertError; } GConvertError;
#define G_CONVERT_ERROR g_convert_error_quark() #define G_CONVERT_ERROR g_convert_error_quark()