luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 12:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use g_set_error_literal where appropriate. Patch from bug #535947.

Browse Source 
svn path=/trunk/; revision=7051
This commit is contained in:
Christian Persch 2008-06-16 16:53:58 +00:00
parent 9c50d657e5
commit 9c17697b56
33 changed files with 481 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2008-06-16 Christian Persch <chpe@gnome.org>
* glib/gbookmarkfile.c
* glib/gconvert.c
* glib/gfileutils.c
* glib/giochannel.c
* glib/giounix.c
* glib/giowin32.c
* glib/gkeyfile.c
* glib/gregex.c
* glib/gshell.c
* glib/gspawn-win32.c
* glib/gutf8.c: Use g_set_error_literal where appropriate. Patch from
bug #535947.
2008-06-16 Christian Persch <chpe@gnome.org> 2008-06-16 Christian Persch <chpe@gnome.org>
* docs/reference/glib/glib-sections.txt: * docs/reference/glib/glib-sections.txt:

24
gio/ChangeLog
View File

@ -1,3 +1,27 @@
2008-06-16 Christian Persch <chpe@gnome.org>
* gio/gappinfo.c
* gio/gbufferedinputstream.c
* gio/gcancellable.c
* gio/gdatainputstream.c
* gio/gdesktopappinfo.c
* gio/gfile.c
* gio/gfileenumerator.c
* gio/gfileinputstream.c
* gio/gfileoutputstream.c
* gio/ginputstream.c
* gio/glocaldirectorymonitor.c
* gio/glocalfile.c
* gio/glocalfileenumerator.c
* gio/glocalfileinfo.c
* gio/glocalfilemonitor.c
* gio/glocalfileoutputstream.c
* gio/gmemoryinputstream.c
* gio/gmemoryoutputstream.c
* gio/goutputstream.c
* gio/gwin32appinfo.c: Use g_set_error_literal where appropriate. Patch from
bug #535947.
2008-06-16 Tor Lillqvist <tml@novell.com> 2008-06-16 Tor Lillqvist <tml@novell.com>
Bug 538362 - Get Win32 icons back in the file chooser Bug 538362 - Get Win32 icons back in the file chooser

15
gio/gappinfo.c
View File

@ -271,7 +271,8 @@ g_app_info_set_as_default_for_extension (GAppInfo *appinfo,
if (iface->set_as_default_for_extension) if (iface->set_as_default_for_extension)
return (* iface->set_as_default_for_extension) (appinfo, extension, error); return (* iface->set_as_default_for_extension) (appinfo, extension, error);
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "g_app_info_set_as_default_for_extension not supported yet"); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"g_app_info_set_as_default_for_extension not supported yet");
return FALSE; return FALSE;
} }
@ -302,9 +303,9 @@ g_app_info_add_supports_type (GAppInfo *appinfo,
if (iface->add_supports_type) if (iface->add_supports_type)
return (* iface->add_supports_type) (appinfo, content_type, error); return (* iface->add_supports_type) (appinfo, content_type, error);
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
"g_app_info_add_supports_type not supported yet"); "g_app_info_add_supports_type not supported yet");
return FALSE; return FALSE;
} }
@ -360,9 +361,9 @@ g_app_info_remove_supports_type (GAppInfo *appinfo,
if (iface->remove_supports_type) if (iface->remove_supports_type)
return (* iface->remove_supports_type) (appinfo, content_type, error); return (* iface->remove_supports_type) (appinfo, content_type, error);
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
"g_app_info_remove_supports_type not supported yet"); "g_app_info_remove_supports_type not supported yet");
return FALSE; return FALSE;
} }

4
gio/gbufferedinputstream.c
View File

@ -865,8 +865,8 @@ g_buffered_input_stream_read_byte (GBufferedInputStream *stream,
if (g_input_stream_is_closed (input_stream)) if (g_input_stream_is_closed (input_stream))
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_CLOSED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CLOSED,
_("Stream is already closed")); _("Stream is already closed"));
return -1; return -1;
} }

8
gio/gcancellable.c
View File

@ -289,10 +289,10 @@ g_cancellable_set_error_if_cancelled (GCancellable *cancellable,
{ {
if (g_cancellable_is_cancelled (cancellable)) if (g_cancellable_is_cancelled (cancellable))
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_CANCELLED, G_IO_ERROR_CANCELLED,
_("Operation was cancelled")); _("Operation was cancelled"));
return TRUE; return TRUE;
} }

4
gio/gdatainputstream.c
View File

@ -305,8 +305,8 @@ read_data (GDataInputStream *stream,
return FALSE; return FALSE;
if (res == 0) if (res == 0)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Unexpected early end-of-stream")); _("Unexpected early end-of-stream"));
return FALSE; return FALSE;
} }
} }

8
gio/gdesktopappinfo.c
View File

@ -584,8 +584,8 @@ expand_application_parameters (GDesktopAppInfo *info,
if (info->exec == NULL) if (info->exec == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Desktop file didn't specify Exec field")); _("Desktop file didn't specify Exec field"));
return FALSE; return FALSE;
} }
@ -878,8 +878,8 @@ g_desktop_app_info_launch_uris (GAppInfo *appinfo,
if (info->terminal && !prepend_terminal_to_vector (&argc, &argv)) if (info->terminal && !prepend_terminal_to_vector (&argc, &argv))
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Unable to find terminal required for application")); _("Unable to find terminal required for application"));
goto out; goto out;
} }

114
gio/gfile.c
View File

@ -806,9 +806,9 @@ g_file_enumerate_children (GFile *file,
if (iface->enumerate_children == NULL) if (iface->enumerate_children == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return NULL; return NULL;
} }
@ -1034,9 +1034,9 @@ g_file_query_info (GFile *file,
if (iface->query_info == NULL) if (iface->query_info == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return NULL; return NULL;
} }
@ -1167,9 +1167,9 @@ g_file_query_filesystem_info (GFile *file,
if (iface->query_filesystem_info == NULL) if (iface->query_filesystem_info == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return NULL; return NULL;
} }
@ -1285,7 +1285,7 @@ g_file_find_enclosing_mount (GFile *file,
if (iface->find_enclosing_mount == NULL) if (iface->find_enclosing_mount == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
/* Translators: This is an error message when trying to find the /* Translators: This is an error message when trying to find the
* enclosing (user visible) mount of a file, but none exists. */ * enclosing (user visible) mount of a file, but none exists. */
_("Containing mount does not exist")); _("Containing mount does not exist"));
@ -1398,9 +1398,9 @@ g_file_read (GFile *file,
if (iface->read_fn == NULL) if (iface->read_fn == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return NULL; return NULL;
} }
@ -1451,9 +1451,9 @@ g_file_append_to (GFile *file,
if (iface->append_to == NULL) if (iface->append_to == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return NULL; return NULL;
} }
@ -1507,9 +1507,9 @@ g_file_create (GFile *file,
if (iface->create == NULL) if (iface->create == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return NULL; return NULL;
} }
@ -1589,9 +1589,9 @@ g_file_replace (GFile *file,
if (iface->replace == NULL) if (iface->replace == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return NULL; return NULL;
} }
@ -1929,8 +1929,8 @@ copy_symlink (GFile *destination,
if (file_type == G_FILE_TYPE_DIRECTORY) if (file_type == G_FILE_TYPE_DIRECTORY)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY,
_("Can't copy over directory")); _("Can't copy over directory"));
return FALSE; return FALSE;
} }
} }
@ -1989,16 +1989,16 @@ open_source_for_copy (GFile *source,
{ {
if (file_type == G_FILE_TYPE_DIRECTORY) if (file_type == G_FILE_TYPE_DIRECTORY)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_WOULD_MERGE, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_WOULD_MERGE,
_("Can't copy directory over directory")); _("Can't copy directory over directory"));
return NULL; return NULL;
} }
/* continue to would_recurse error */ /* continue to would_recurse error */
} }
else else
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_EXISTS, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_EXISTS,
_("Target file exists")); _("Target file exists"));
return NULL; return NULL;
} }
} }
@ -2015,8 +2015,8 @@ open_source_for_copy (GFile *source,
g_error_free (my_error); g_error_free (my_error);
} }
g_set_error (error, G_IO_ERROR, G_IO_ERROR_WOULD_RECURSE, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_WOULD_RECURSE,
_("Can't recursively copy directory")); _("Can't recursively copy directory"));
return NULL; return NULL;
} }
@ -2646,9 +2646,9 @@ g_file_move (GFile *source,
if (flags & G_FILE_COPY_NO_FALLBACK_FOR_MOVE) if (flags & G_FILE_COPY_NO_FALLBACK_FOR_MOVE)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return FALSE; return FALSE;
} }
@ -2697,9 +2697,9 @@ g_file_make_directory (GFile *file,
if (iface->make_directory == NULL) if (iface->make_directory == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return FALSE; return FALSE;
} }
@ -2815,9 +2815,9 @@ g_file_make_symbolic_link (GFile *file,
if (*symlink_value == '\0') if (*symlink_value == '\0')
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid symlink value given")); _("Invalid symlink value given"));
return FALSE; return FALSE;
} }
@ -2825,9 +2825,9 @@ g_file_make_symbolic_link (GFile *file,
if (iface->make_symbolic_link == NULL) if (iface->make_symbolic_link == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return FALSE; return FALSE;
} }
@ -2865,9 +2865,9 @@ g_file_delete (GFile *file,
if (iface->delete_file == NULL) if (iface->delete_file == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return FALSE; return FALSE;
} }
@ -2908,9 +2908,9 @@ g_file_trash (GFile *file,
if (iface->trash == NULL) if (iface->trash == NULL)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Trash not supported")); _("Trash not supported"));
return FALSE; return FALSE;
} }
@ -3189,9 +3189,9 @@ g_file_set_attribute (GFile *file,
if (iface->set_attribute == NULL) if (iface->set_attribute == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return FALSE; return FALSE;
} }
@ -3837,9 +3837,9 @@ g_file_monitor_directory (GFile *file,
if (iface->monitor_dir == NULL) if (iface->monitor_dir == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Operation not supported")); _("Operation not supported"));
return NULL; return NULL;
} }
@ -4999,9 +4999,9 @@ g_file_query_default_handler (GFile *file,
if (appinfo != NULL) if (appinfo != NULL)
return appinfo; return appinfo;
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("No application is registered as handling this file")); _("No application is registered as handling this file"));
return NULL; return NULL;
} }

12
gio/gfileenumerator.c
View File

@ -198,15 +198,15 @@ g_file_enumerator_next_file (GFileEnumerator *enumerator,
if (enumerator->priv->closed) if (enumerator->priv->closed)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_CLOSED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CLOSED,
_("Enumerator is closed")); _("Enumerator is closed"));
return NULL; return NULL;
} }
if (enumerator->priv->pending) if (enumerator->priv->pending)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PENDING,
_("File enumerator has outstanding operation")); _("File enumerator has outstanding operation"));
return NULL; return NULL;
} }
@ -264,8 +264,8 @@ g_file_enumerator_close (GFileEnumerator *enumerator,
if (enumerator->priv->pending) if (enumerator->priv->pending)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PENDING,
_("File enumerator has outstanding operation")); _("File enumerator has outstanding operation"));
return FALSE; return FALSE;
} }

16
gio/gfileinputstream.c
View File

@ -150,8 +150,8 @@ g_file_input_stream_query_info (GFileInputStream *stream,
if (class->query_info) if (class->query_info)
info = class->query_info (stream, attributes, cancellable, error); info = class->query_info (stream, attributes, cancellable, error);
else else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Stream doesn't support query_info")); _("Stream doesn't support query_info"));
if (cancellable) if (cancellable)
g_cancellable_pop_current (cancellable); g_cancellable_pop_current (cancellable);
@ -332,8 +332,8 @@ g_file_input_stream_seek (GFileInputStream *stream,
if (!class->seek) if (!class->seek)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Seek not supported on stream")); _("Seek not supported on stream"));
return FALSE; return FALSE;
} }
@ -376,8 +376,8 @@ g_file_input_stream_seekable_truncate (GSeekable *seekable,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Truncate not allowed on input stream")); _("Truncate not allowed on input stream"));
return FALSE; return FALSE;
} }
@ -417,8 +417,8 @@ query_info_async_thread (GSimpleAsyncResult *res,
if (class->query_info) if (class->query_info)
info = class->query_info (G_FILE_INPUT_STREAM (object), data->attributes, cancellable, &error); info = class->query_info (G_FILE_INPUT_STREAM (object), data->attributes, cancellable, &error);
else else
g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Stream doesn't support query_info")); _("Stream doesn't support query_info"));
if (info == NULL) if (info == NULL)
{ {

16
gio/gfileoutputstream.c
View File

@ -164,8 +164,8 @@ g_file_output_stream_query_info (GFileOutputStream *stream,
if (class->query_info) if (class->query_info)
info = class->query_info (stream, attributes, cancellable, error); info = class->query_info (stream, attributes, cancellable, error);
else else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Stream doesn't support query_info")); _("Stream doesn't support query_info"));
if (cancellable) if (cancellable)
g_cancellable_pop_current (cancellable); g_cancellable_pop_current (cancellable);
@ -377,8 +377,8 @@ g_file_output_stream_seek (GFileOutputStream *stream,
if (!class->seek) if (!class->seek)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Seek not supported on stream")); _("Seek not supported on stream"));
return FALSE; return FALSE;
} }
@ -453,8 +453,8 @@ g_file_output_stream_truncate (GFileOutputStream *stream,
if (!class->truncate_fn) if (!class->truncate_fn)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Truncate not supported on stream")); _("Truncate not supported on stream"));
return FALSE; return FALSE;
} }
@ -519,8 +519,8 @@ query_info_async_thread (GSimpleAsyncResult *res,
if (class->query_info) if (class->query_info)
info = class->query_info (G_FILE_OUTPUT_STREAM (object), data->attributes, cancellable, &error); info = class->query_info (G_FILE_OUTPUT_STREAM (object), data->attributes, cancellable, &error);
else else
g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Stream doesn't support query_info")); _("Stream doesn't support query_info"));
if (info == NULL) if (info == NULL)
{ {

10
gio/ginputstream.c
View File

@ -189,8 +189,8 @@ g_input_stream_read (GInputStream *stream,
if (class->read_fn == NULL) if (class->read_fn == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Input stream doesn't implement read")); _("Input stream doesn't implement read"));
return -1; return -1;
} }
@ -888,14 +888,14 @@ g_input_stream_set_pending (GInputStream *stream, GError **error)
if (stream->priv->closed) if (stream->priv->closed)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_CLOSED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CLOSED,
_("Stream is already closed")); _("Stream is already closed"));
return FALSE; return FALSE;
} }
if (stream->priv->pending) if (stream->priv->pending)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PENDING,
/* Translators: This is an error you get if there is already an /* Translators: This is an error you get if there is already an
* operation running against this stream when you try to start * operation running against this stream when you try to start
* one */ * one */

3
gio/glocaldirectorymonitor.c
View File

@ -266,7 +266,8 @@ _g_local_directory_monitor_new (const char *dirname,
if (type != G_TYPE_INVALID) if (type != G_TYPE_INVALID)
monitor = G_FILE_MONITOR (g_object_new (type, "dirname", dirname, NULL)); monitor = G_FILE_MONITOR (g_object_new (type, "dirname", dirname, NULL));
else else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Unable to find default local directory monitor type")); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Unable to find default local directory monitor type"));
/* This is non-null on first pass here. Unref the class now. /* This is non-null on first pass here. Unref the class now.
* This is to avoid unloading the module and then loading it * This is to avoid unloading the module and then loading it

110
gio/glocalfile.c
View File

@ -1054,7 +1054,7 @@ g_local_file_find_enclosing_mount (GFile *file,
if (g_lstat (local->filename, &buf) != 0) if (g_lstat (local->filename, &buf) != 0)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
/* Translators: This is an error message when trying to /* Translators: This is an error message when trying to
* find the enclosing (user visible) mount of a file, but * find the enclosing (user visible) mount of a file, but
* none exists. */ * none exists. */
@ -1065,7 +1065,7 @@ g_local_file_find_enclosing_mount (GFile *file,
mountpoint = find_mountpoint_for (local->filename, buf.st_dev); mountpoint = find_mountpoint_for (local->filename, buf.st_dev);
if (mountpoint == NULL) if (mountpoint == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
/* Translators: This is an error message when trying to /* Translators: This is an error message when trying to
* find the enclosing (user visible) mount of a file, but * find the enclosing (user visible) mount of a file, but
* none exists. */ * none exists. */
@ -1078,7 +1078,7 @@ g_local_file_find_enclosing_mount (GFile *file,
if (mount) if (mount)
return mount; return mount;
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
/* Translators: This is an error message when trying to find /* Translators: This is an error message when trying to find
* the enclosing (user visible) mount of a file, but none * the enclosing (user visible) mount of a file, but none
* exists. */ * exists. */
@ -1100,9 +1100,9 @@ g_local_file_set_display_name (GFile *file,
parent = g_file_get_parent (file); parent = g_file_get_parent (file);
if (parent == NULL) if (parent == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_FAILED, G_IO_ERROR_FAILED,
_("Can't rename root directory")); _("Can't rename root directory"));
return NULL; return NULL;
} }
@ -1118,9 +1118,9 @@ g_local_file_set_display_name (GFile *file,
if (!(g_lstat (new_local->filename, &statbuf) == -1 && if (!(g_lstat (new_local->filename, &statbuf) == -1 &&
errno == ENOENT)) errno == ENOENT))
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_EXISTS, G_IO_ERROR_EXISTS,
_("Can't rename file, filename already exist")); _("Can't rename file, filename already exist"));
return NULL; return NULL;
} }
@ -1131,9 +1131,9 @@ g_local_file_set_display_name (GFile *file,
if (errsv == EINVAL) if (errsv == EINVAL)
/* We can't get a rename file into itself error herer, /* We can't get a rename file into itself error herer,
so this must be an invalid filename, on e.g. FAT */ so this must be an invalid filename, on e.g. FAT */
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_FILENAME, G_IO_ERROR_INVALID_FILENAME,
_("Invalid filename")); _("Invalid filename"));
else else
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),
@ -1264,9 +1264,9 @@ g_local_file_read (GFile *file,
if (fstat(fd, &buf) == 0 && S_ISDIR (buf.st_mode)) if (fstat(fd, &buf) == 0 && S_ISDIR (buf.st_mode))
{ {
close (fd); close (fd);
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_IS_DIRECTORY, G_IO_ERROR_IS_DIRECTORY,
_("Can't open directory")); _("Can't open directory"));
return NULL; return NULL;
} }
@ -1732,9 +1732,9 @@ g_local_file_trash (GFile *file,
topdir = find_topdir_for (local->filename); topdir = find_topdir_for (local->filename);
if (topdir == NULL) if (topdir == NULL)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Unable to find toplevel directory for trash")); _("Unable to find toplevel directory for trash"));
return FALSE; return FALSE;
} }
@ -1811,9 +1811,9 @@ g_local_file_trash (GFile *file,
if (trashdir == NULL) if (trashdir == NULL)
{ {
g_free (topdir); g_free (topdir);
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Unable to find or create trash directory")); _("Unable to find or create trash directory"));
return FALSE; return FALSE;
} }
} }
@ -1831,9 +1831,9 @@ g_local_file_trash (GFile *file,
g_free (topdir); g_free (topdir);
g_free (infodir); g_free (infodir);
g_free (filesdir); g_free (filesdir);
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Unable to find or create trash directory")); _("Unable to find or create trash directory"));
return FALSE; return FALSE;
} }
@ -1995,9 +1995,9 @@ g_local_file_make_directory (GFile *file,
if (errsv == EINVAL) if (errsv == EINVAL)
/* This must be an invalid filename, on e.g. FAT */ /* This must be an invalid filename, on e.g. FAT */
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_FILENAME, G_IO_ERROR_INVALID_FILENAME,
_("Invalid filename")); _("Invalid filename"));
else else
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),
@ -2024,9 +2024,9 @@ g_local_file_make_symbolic_link (GFile *file,
if (errsv == EINVAL) if (errsv == EINVAL)
/* This must be an invalid filename, on e.g. FAT */ /* This must be an invalid filename, on e.g. FAT */
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_FILENAME, G_IO_ERROR_INVALID_FILENAME,
_("Invalid filename")); _("Invalid filename"));
else else
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),
@ -2036,7 +2036,7 @@ g_local_file_make_symbolic_link (GFile *file,
} }
return TRUE; return TRUE;
#else #else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Symlinks not supported"); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Symlinks not supported");
return FALSE; return FALSE;
#endif #endif
} }
@ -2052,7 +2052,7 @@ g_local_file_copy (GFile *source,
GError **error) GError **error)
{ {
/* Fall back to default copy */ /* Fall back to default copy */
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Copy not supported"); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Copy not supported");
return FALSE; return FALSE;
} }
@ -2076,7 +2076,7 @@ g_local_file_move (GFile *source,
!G_IS_LOCAL_FILE (destination)) !G_IS_LOCAL_FILE (destination))
{ {
/* Fall back to default move */ /* Fall back to default move */
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Move not supported"); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Move not supported");
return FALSE; return FALSE;
} }
@ -2110,24 +2110,24 @@ g_local_file_move (GFile *source,
if (S_ISDIR (statbuf.st_mode)) if (S_ISDIR (statbuf.st_mode))
{ {
if (source_is_dir) if (source_is_dir)
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_WOULD_MERGE, G_IO_ERROR_WOULD_MERGE,
_("Can't move directory over directory")); _("Can't move directory over directory"));
else else
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_IS_DIRECTORY, G_IO_ERROR_IS_DIRECTORY,
_("Can't copy over directory")); _("Can't copy over directory"));
return FALSE; return FALSE;
} }
} }
else else
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_EXISTS, G_IO_ERROR_EXISTS,
_("Target file exists")); _("Target file exists"));
return FALSE; return FALSE;
} }
} }
@ -2137,10 +2137,10 @@ g_local_file_move (GFile *source,
backup_name = g_strconcat (local_destination->filename, "~", NULL); backup_name = g_strconcat (local_destination->filename, "~", NULL);
if (g_rename (local_destination->filename, backup_name) == -1) if (g_rename (local_destination->filename, backup_name) == -1)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_CANT_CREATE_BACKUP, G_IO_ERROR_CANT_CREATE_BACKUP,
_("Backup file creation failed")); _("Backup file creation failed"));
g_free (backup_name); g_free (backup_name);
return FALSE; return FALSE;
} }
@ -2171,16 +2171,16 @@ g_local_file_move (GFile *source,
if (errsv == EXDEV) if (errsv == EXDEV)
/* This will cause the fallback code to run */ /* This will cause the fallback code to run */
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Move between mounts not supported")); _("Move between mounts not supported"));
else if (errsv == EINVAL) else if (errsv == EINVAL)
/* This must be an invalid filename, on e.g. FAT, or /* This must be an invalid filename, on e.g. FAT, or
we're trying to move the file into itself... we're trying to move the file into itself...
We return invalid filename for both... */ We return invalid filename for both... */
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_FILENAME, G_IO_ERROR_INVALID_FILENAME,
_("Invalid filename")); _("Invalid filename"));
else else
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),

12
gio/glocalfileenumerator.c
View File

@ -180,9 +180,9 @@ convert_file_to_io_error (GError **error,
} }
} }
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
new_code, new_code,
"%s", file_error->message); file_error->message);
} }
#endif #endif
@ -223,9 +223,9 @@ _g_local_file_enumerator_new (GLocalFile *file,
{ {
errsv = errno; errsv = errno;
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
g_io_error_from_errno (errsv), g_io_error_from_errno (errsv),
"%s", g_strerror (errsv)); g_strerror (errsv));
g_free (filename); g_free (filename);
return NULL; return NULL;
} }

34
gio/glocalfileinfo.c
View File

@ -712,22 +712,22 @@ set_xattr (char *filename,
if (attr_value == NULL) if (attr_value == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Attribute value must be non-NULL")); _("Attribute value must be non-NULL"));
return FALSE; return FALSE;
} }
if (attr_value->type != G_FILE_ATTRIBUTE_TYPE_STRING) if (attr_value->type != G_FILE_ATTRIBUTE_TYPE_STRING)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid attribute type (string expected)")); _("Invalid attribute type (string expected)"));
return FALSE; return FALSE;
} }
if (!name_is_valid (escaped_attribute)) if (!name_is_valid (escaped_attribute))
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid extended attribute name")); _("Invalid extended attribute name"));
return FALSE; return FALSE;
} }
@ -1739,8 +1739,8 @@ get_uint32 (const GFileAttributeValue *value,
{ {
if (value->type != G_FILE_ATTRIBUTE_TYPE_UINT32) if (value->type != G_FILE_ATTRIBUTE_TYPE_UINT32)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid attribute type (uint32 expected)")); _("Invalid attribute type (uint32 expected)"));
return FALSE; return FALSE;
} }
@ -1757,8 +1757,8 @@ get_uint64 (const GFileAttributeValue *value,
{ {
if (value->type != G_FILE_ATTRIBUTE_TYPE_UINT64) if (value->type != G_FILE_ATTRIBUTE_TYPE_UINT64)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid attribute type (uint64 expected)")); _("Invalid attribute type (uint64 expected)"));
return FALSE; return FALSE;
} }
@ -1776,8 +1776,8 @@ get_byte_string (const GFileAttributeValue *value,
{ {
if (value->type != G_FILE_ATTRIBUTE_TYPE_BYTE_STRING) if (value->type != G_FILE_ATTRIBUTE_TYPE_BYTE_STRING)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid attribute type (byte string expected)")); _("Invalid attribute type (byte string expected)"));
return FALSE; return FALSE;
} }
@ -1876,8 +1876,8 @@ set_symlink (char *filename,
if (val == NULL) if (val == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("symlink must be non-NULL")); _("symlink must be non-NULL"));
return FALSE; return FALSE;
} }
@ -1894,9 +1894,9 @@ set_symlink (char *filename,
if (!S_ISLNK (statbuf.st_mode)) if (!S_ISLNK (statbuf.st_mode))
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SYMBOLIC_LINK, G_IO_ERROR_NOT_SYMBOLIC_LINK,
_("Error setting symlink: file is not a symlink")); _("Error setting symlink: file is not a symlink"));
return FALSE; return FALSE;
} }

3
gio/glocalfilemonitor.c
View File

@ -193,7 +193,8 @@ _g_local_file_monitor_new (const char *pathname,
if (type != G_TYPE_INVALID) if (type != G_TYPE_INVALID)
monitor = G_FILE_MONITOR (g_object_new (type, "filename", pathname, NULL)); monitor = G_FILE_MONITOR (g_object_new (type, "filename", pathname, NULL));
else else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Unable to find default local file monitor type")); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
_("Unable to find default local file monitor type"));
/* This is non-null on first pass here. Unref the class now. /* This is non-null on first pass here. Unref the class now.
* This is to avoid unloading the module and then loading it * This is to avoid unloading the module and then loading it

82
gio/glocalfileoutputstream.c
View File

@ -466,9 +466,9 @@ _g_local_file_output_stream_create (const char *filename,
if (errsv == EINVAL) if (errsv == EINVAL)
/* This must be an invalid filename, on e.g. FAT */ /* This must be an invalid filename, on e.g. FAT */
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_FILENAME, G_IO_ERROR_INVALID_FILENAME,
_("Invalid filename")); _("Invalid filename"));
else else
{ {
char *display_name = g_filename_display_name (filename); char *display_name = g_filename_display_name (filename);
@ -511,9 +511,9 @@ _g_local_file_output_stream_append (const char *filename,
if (errsv == EINVAL) if (errsv == EINVAL)
/* This must be an invalid filename, on e.g. FAT */ /* This must be an invalid filename, on e.g. FAT */
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_FILENAME, G_IO_ERROR_INVALID_FILENAME,
_("Invalid filename")); _("Invalid filename"));
else else
{ {
char *display_name = g_filename_display_name (filename); char *display_name = g_filename_display_name (filename);
@ -672,15 +672,15 @@ handle_overwrite_open (const char *filename,
if (!S_ISREG (original_stat.st_mode)) if (!S_ISREG (original_stat.st_mode))
{ {
if (S_ISDIR (original_stat.st_mode)) if (S_ISDIR (original_stat.st_mode))
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_IS_DIRECTORY, G_IO_ERROR_IS_DIRECTORY,
_("Target file is a directory")); _("Target file is a directory"));
else else
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_NOT_REGULAR_FILE, G_IO_ERROR_NOT_REGULAR_FILE,
_("Target file is not a regular file")); _("Target file is not a regular file"));
goto err_out; goto err_out;
} }
@ -689,10 +689,10 @@ handle_overwrite_open (const char *filename,
current_etag = _g_local_file_info_create_etag (&original_stat); current_etag = _g_local_file_info_create_etag (&original_stat);
if (strcmp (etag, current_etag) != 0) if (strcmp (etag, current_etag) != 0)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_WRONG_ETAG, G_IO_ERROR_WRONG_ETAG,
_("The file was externally modified")); _("The file was externally modified"));
g_free (current_etag); g_free (current_etag);
goto err_out; goto err_out;
} }
@ -770,10 +770,10 @@ handle_overwrite_open (const char *filename,
if (g_unlink (backup_filename) == -1 && errno != ENOENT) if (g_unlink (backup_filename) == -1 && errno != ENOENT)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_CANT_CREATE_BACKUP, G_IO_ERROR_CANT_CREATE_BACKUP,
_("Backup file creation failed")); _("Backup file creation failed"));
g_free (backup_filename); g_free (backup_filename);
goto err_out; goto err_out;
} }
@ -784,10 +784,10 @@ handle_overwrite_open (const char *filename,
if (bfd == -1) if (bfd == -1)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_CANT_CREATE_BACKUP, G_IO_ERROR_CANT_CREATE_BACKUP,
_("Backup file creation failed")); _("Backup file creation failed"));
g_free (backup_filename); g_free (backup_filename);
goto err_out; goto err_out;
} }
@ -799,10 +799,10 @@ handle_overwrite_open (const char *filename,
#if defined(HAVE_FCHOWN) && defined(HAVE_FCHMOD) #if defined(HAVE_FCHOWN) && defined(HAVE_FCHMOD)
if (fstat (bfd, &tmp_statbuf) != 0) if (fstat (bfd, &tmp_statbuf) != 0)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_CANT_CREATE_BACKUP, G_IO_ERROR_CANT_CREATE_BACKUP,
_("Backup file creation failed")); _("Backup file creation failed"));
g_unlink (backup_filename); g_unlink (backup_filename);
g_free (backup_filename); g_free (backup_filename);
goto err_out; goto err_out;
@ -815,10 +815,10 @@ handle_overwrite_open (const char *filename,
(original_stat.st_mode & 0707) | (original_stat.st_mode & 0707) |
((original_stat.st_mode & 07) << 3)) != 0) ((original_stat.st_mode & 07) << 3)) != 0)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_CANT_CREATE_BACKUP, G_IO_ERROR_CANT_CREATE_BACKUP,
_("Backup file creation failed")); _("Backup file creation failed"));
g_unlink (backup_filename); g_unlink (backup_filename);
close (bfd); close (bfd);
g_free (backup_filename); g_free (backup_filename);
@ -829,10 +829,10 @@ handle_overwrite_open (const char *filename,
if (!copy_file_data (fd, bfd, NULL)) if (!copy_file_data (fd, bfd, NULL))
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_CANT_CREATE_BACKUP, G_IO_ERROR_CANT_CREATE_BACKUP,
_("Backup file creation failed")); _("Backup file creation failed"));
g_unlink (backup_filename); g_unlink (backup_filename);
close (bfd); close (bfd);
g_free (backup_filename); g_free (backup_filename);
@ -919,9 +919,9 @@ _g_local_file_output_stream_replace (const char *filename,
if (errsv == EINVAL) if (errsv == EINVAL)
/* This must be an invalid filename, on e.g. FAT */ /* This must be an invalid filename, on e.g. FAT */
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_FILENAME, G_IO_ERROR_INVALID_FILENAME,
_("Invalid filename")); _("Invalid filename"));
else else
{ {
char *display_name = g_filename_display_name (filename); char *display_name = g_filename_display_name (filename);

24
gio/gmemoryinputstream.c
View File

@ -480,20 +480,20 @@ g_memory_input_stream_seek (GSeekable *seekable,
break; break;
default: default:
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid GSeekType supplied")); _("Invalid GSeekType supplied"));
return FALSE; return FALSE;
} }
if (absolute < 0 || absolute > priv->len) if (absolute < 0 || absolute > priv->len)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid seek request")); _("Invalid seek request"));
return FALSE; return FALSE;
} }
@ -514,10 +514,10 @@ g_memory_input_stream_truncate (GSeekable *seekable,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Cannot truncate GMemoryInputStream")); _("Cannot truncate GMemoryInputStream"));
return FALSE; return FALSE;
} }

40
gio/gmemoryoutputstream.c
View File

@ -281,10 +281,10 @@ array_check_boundary (GMemoryOutputStream *stream,
{ {
if (size > G_MAXUINT) if (size > G_MAXUINT)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_FAILED, G_IO_ERROR_FAILED,
_("Reached maximum data array limit")); _("Reached maximum data array limit"));
return FALSE; return FALSE;
} }
@ -316,10 +316,10 @@ array_resize (GMemoryOutputStream *ostream,
priv->pos < priv->len) priv->pos < priv->len)
return TRUE; /* Short write */ return TRUE; /* Short write */
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_NO_SPACE, G_IO_ERROR_NO_SPACE,
_("Memory output stream not resizable")); _("Memory output stream not resizable"));
return FALSE; return FALSE;
} }
@ -332,10 +332,10 @@ array_resize (GMemoryOutputStream *ostream,
priv->pos < priv->len) priv->pos < priv->len)
return TRUE; /* Short write */ return TRUE; /* Short write */
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_NO_SPACE, G_IO_ERROR_NO_SPACE,
_("Failed to resize memory output stream")); _("Failed to resize memory output stream"));
return FALSE; return FALSE;
} }
@ -538,20 +538,20 @@ g_memory_output_stream_seek (GSeekable *seekable,
break; break;
default: default:
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid GSeekType supplied")); _("Invalid GSeekType supplied"));
return FALSE; return FALSE;
} }
if (absolute < 0) if (absolute < 0)
{ {
g_set_error (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid seek request")); _("Invalid seek request"));
return FALSE; return FALSE;
} }

26
gio/goutputstream.c
View File

@ -196,8 +196,8 @@ g_output_stream_write (GOutputStream *stream,
if (class->write_fn == NULL) if (class->write_fn == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Output stream doesn't implement write")); _("Output stream doesn't implement write"));
return -1; return -1;
} }
@ -357,8 +357,8 @@ g_output_stream_splice (GOutputStream *stream,
if (g_input_stream_is_closed (source)) if (g_input_stream_is_closed (source))
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_CLOSED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CLOSED,
_("Source stream is already closed")); _("Source stream is already closed"));
return -1; return -1;
} }
@ -397,8 +397,8 @@ g_output_stream_real_splice (GOutputStream *stream,
bytes_copied = 0; bytes_copied = 0;
if (class->write_fn == NULL) if (class->write_fn == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
_("Output stream doesn't implement write")); _("Output stream doesn't implement write"));
res = FALSE; res = FALSE;
goto notsupported; goto notsupported;
} }
@ -1070,18 +1070,18 @@ g_output_stream_set_pending (GOutputStream *stream,
if (stream->priv->closed) if (stream->priv->closed)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_CLOSED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CLOSED,
_("Stream is already closed")); _("Stream is already closed"));
return FALSE; return FALSE;
} }
if (stream->priv->pending) if (stream->priv->pending)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PENDING,
/* Translators: This is an error you get if there is /* Translators: This is an error you get if there is
* already an operation running against this stream when * already an operation running against this stream when
* you try to start one */ * you try to start one */
_("Stream has outstanding operation")); _("Stream has outstanding operation"));
return FALSE; return FALSE;
} }

20
gio/gwin32appinfo.c
View File

@ -273,7 +273,7 @@ g_win32_app_info_launch (GAppInfo *appinfo,
NULL, NULL,
&class_key) != S_OK) &class_key) != S_OK)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Can't find application")); g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Can't find application"));
return FALSE; return FALSE;
} }
#endif #endif
@ -343,9 +343,9 @@ g_win32_app_info_launch_uris (GAppInfo *appinfo,
GAppLaunchContext *launch_context, GAppLaunchContext *launch_context,
GError **error) GError **error)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("URIs not supported")); _("URIs not supported"));
return FALSE; return FALSE;
} }
@ -365,9 +365,9 @@ g_win32_app_info_set_as_default_for_type (GAppInfo *appinfo,
const char *content_type, const char *content_type,
GError **error) GError **error)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("association changes not supported on win32")); _("association changes not supported on win32"));
return FALSE; return FALSE;
} }
@ -377,9 +377,9 @@ g_app_info_create_from_commandline (const char *commandline,
GAppInfoCreateFlags flags, GAppInfoCreateFlags flags,
GError **error) GError **error)
{ {
g_set_error (error, G_IO_ERROR, g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED, G_IO_ERROR_NOT_SUPPORTED,
_("Association creation not supported on win32")); _("Association creation not supported on win32"));
return NULL; return NULL;
} }

6
glib/gbookmarkfile.c
View File

@ -1793,9 +1793,9 @@ find_file_in_data_dirs (const gchar *file,
if (!path) if (!path)
{ {
g_set_error (error, G_BOOKMARK_FILE_ERROR, g_set_error_literal (error, G_BOOKMARK_FILE_ERROR,
G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND, G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND,
_("No valid bookmark file found in data dirs")); _("No valid bookmark file found in data dirs"));
return NULL; return NULL;
} }

16
glib/gconvert.c
View File

@ -628,8 +628,8 @@ g_convert_with_iconv (const gchar *str,
break; break;
case EILSEQ: case EILSEQ:
if (error) if (error)
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid byte sequence in conversion input")); _("Invalid byte sequence in conversion input"));
have_error = TRUE; have_error = TRUE;
break; break;
default: default:
@ -665,8 +665,8 @@ g_convert_with_iconv (const gchar *str,
if (!have_error) if (!have_error)
{ {
if (error) if (error)
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Partial character sequence at end of input")); _("Partial character sequence at end of input"));
have_error = TRUE; have_error = TRUE;
} }
} }
@ -1013,8 +1013,8 @@ strdup_len (const gchar *string,
if (bytes_written) if (bytes_written)
*bytes_written = 0; *bytes_written = 0;
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid byte sequence in conversion input")); _("Invalid byte sequence in conversion input"));
return NULL; return NULL;
} }
@ -1890,8 +1890,8 @@ g_filename_to_uri (const gchar *filename,
!(g_utf8_validate (hostname, -1, NULL) !(g_utf8_validate (hostname, -1, NULL)
&& hostname_validate (hostname))) && hostname_validate (hostname)))
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid hostname")); _("Invalid hostname"));
return NULL; return NULL;
} }

8
glib/gfileutils.c
View File

@ -1902,10 +1902,10 @@ g_file_read_link (const gchar *filename,
buffer = g_realloc (buffer, size); buffer = g_realloc (buffer, size);
} }
#else #else
g_set_error (error, g_set_error_literal (error,
G_FILE_ERROR, G_FILE_ERROR,
G_FILE_ERROR_INVAL, G_FILE_ERROR_INVAL,
_("Symbolic links not supported")); _("Symbolic links not supported"));
return NULL; return NULL;
#endif #endif

41
glib/giochannel.c
View File

@ -1325,7 +1325,7 @@ reencode:
status = G_IO_STATUS_NORMAL; status = G_IO_STATUS_NORMAL;
else else
{ {
g_set_error (err, G_CONVERT_ERROR, g_set_error_literal (err, G_CONVERT_ERROR,
G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid byte sequence in conversion input")); _("Invalid byte sequence in conversion input"));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
@ -1367,7 +1367,7 @@ reencode:
status = G_IO_STATUS_NORMAL; status = G_IO_STATUS_NORMAL;
else else
{ {
g_set_error (err, G_CONVERT_ERROR, g_set_error_literal (err, G_CONVERT_ERROR,
G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid byte sequence in conversion input")); _("Invalid byte sequence in conversion input"));
status = G_IO_STATUS_ERROR; status = G_IO_STATUS_ERROR;
@ -1503,8 +1503,8 @@ g_io_channel_read_line_backend (GIOChannel *channel,
if (!channel->use_buffer) if (!channel->use_buffer)
{ {
/* Can't do a raw read in read_line */ /* Can't do a raw read in read_line */
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
_("Can't do a raw read in g_io_channel_read_line_string")); _("Can't do a raw read in g_io_channel_read_line_string"));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1549,9 +1549,10 @@ read_again:
if (channel->encoding && channel->read_buf->len != 0) if (channel->encoding && channel->read_buf->len != 0)
{ {
g_set_error (error, G_CONVERT_ERROR, g_set_error_literal (error, G_CONVERT_ERROR,
G_CONVERT_ERROR_PARTIAL_INPUT, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Leftover unconverted data in read buffer")); _("Leftover unconverted data in "
"read buffer"));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
else else
@ -1630,8 +1631,8 @@ read_again:
{ {
if (channel->encoding && channel->read_buf->len > 0) if (channel->encoding && channel->read_buf->len > 0)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Channel terminates in a partial character")); _("Channel terminates in a partial character"));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
line_length = use_buf->len; line_length = use_buf->len;
@ -1693,8 +1694,8 @@ g_io_channel_read_to_end (GIOChannel *channel,
if (!channel->use_buffer) if (!channel->use_buffer)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
_("Can't do a raw read in g_io_channel_read_to_end")); _("Can't do a raw read in g_io_channel_read_to_end"));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1707,8 +1708,8 @@ g_io_channel_read_to_end (GIOChannel *channel,
if (channel->encoding && channel->read_buf->len > 0) if (channel->encoding && channel->read_buf->len > 0)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Channel terminates in a partial character")); _("Channel terminates in a partial character"));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1806,9 +1807,9 @@ g_io_channel_read_chars (GIOChannel *channel,
if (status == G_IO_STATUS_EOF && channel->encoding if (status == G_IO_STATUS_EOF && channel->encoding
&& BUF_LEN (channel->read_buf) > 0) && BUF_LEN (channel->read_buf) > 0)
{ {
g_set_error (error, G_CONVERT_ERROR, g_set_error_literal (error, G_CONVERT_ERROR,
G_CONVERT_ERROR_PARTIAL_INPUT, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Leftover unconverted data in read buffer")); _("Leftover unconverted data in read buffer"));
status = G_IO_STATUS_ERROR; status = G_IO_STATUS_ERROR;
} }
@ -1893,9 +1894,9 @@ g_io_channel_read_unichar (GIOChannel *channel,
if (status == G_IO_STATUS_EOF && BUF_LEN (channel->read_buf) > 0) if (status == G_IO_STATUS_EOF && BUF_LEN (channel->read_buf) > 0)
{ {
g_set_error (error, G_CONVERT_ERROR, g_set_error_literal (error, G_CONVERT_ERROR,
G_CONVERT_ERROR_PARTIAL_INPUT, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Leftover unconverted data in read buffer")); _("Leftover unconverted data in read buffer"));
status = G_IO_STATUS_ERROR; status = G_IO_STATUS_ERROR;
} }
@ -2210,7 +2211,7 @@ reconvert:
} }
break; break;
case EILSEQ: case EILSEQ:
g_set_error (error, G_CONVERT_ERROR, g_set_error_literal (error, G_CONVERT_ERROR,
G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid byte sequence in conversion input")); _("Invalid byte sequence in conversion input"));
if (from_buf_old_len > 0 && from_buf_len == left_len) if (from_buf_old_len > 0 && from_buf_len == left_len)

48
glib/giounix.c
View File

@ -203,9 +203,9 @@ g_io_unix_read (GIOChannel *channel,
return G_IO_STATUS_AGAIN; return G_IO_STATUS_AGAIN;
#endif #endif
default: default:
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
} }
@ -243,9 +243,9 @@ g_io_unix_write (GIOChannel *channel,
return G_IO_STATUS_AGAIN; return G_IO_STATUS_AGAIN;
#endif #endif
default: default:
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
} }
@ -285,9 +285,9 @@ g_io_unix_seek (GIOChannel *channel,
tmp_offset = offset; tmp_offset = offset;
if (tmp_offset != offset) if (tmp_offset != offset)
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (EINVAL), g_io_channel_error_from_errno (EINVAL),
g_strerror (EINVAL)); g_strerror (EINVAL));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -295,9 +295,9 @@ g_io_unix_seek (GIOChannel *channel,
if (result < 0) if (result < 0)
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -313,9 +313,9 @@ g_io_unix_close (GIOChannel *channel,
if (close (unix_channel->fd) < 0) if (close (unix_channel->fd) < 0)
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -376,9 +376,9 @@ g_io_unix_set_flags (GIOChannel *channel,
if (fcntl (unix_channel->fd, F_SETFL, fcntl_flags) == -1) if (fcntl (unix_channel->fd, F_SETFL, fcntl_flags) == -1)
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -512,18 +512,18 @@ g_io_channel_new_file (const gchar *filename,
fid = open (filename, flags, create_mode); fid = open (filename, flags, create_mode);
if (fid == -1) if (fid == -1)
{ {
g_set_error (error, G_FILE_ERROR, g_set_error_literal (error, G_FILE_ERROR,
g_file_error_from_errno (errno), g_file_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return (GIOChannel *)NULL; return (GIOChannel *)NULL;
} }
if (fstat (fid, &buffer) == -1) /* In case someone opens a FIFO */ if (fstat (fid, &buffer) == -1) /* In case someone opens a FIFO */
{ {
close (fid); close (fid);
g_set_error (error, G_FILE_ERROR, g_set_error_literal (error, G_FILE_ERROR,
g_file_error_from_errno (errno), g_file_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return (GIOChannel *)NULL; return (GIOChannel *)NULL;
} }

68
glib/giowin32.c
View File

@ -975,8 +975,8 @@ g_io_win32_msg_read (GIOChannel *channel,
if (count < sizeof (MSG)) if (count < sizeof (MSG))
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_INVAL, g_set_error_literal (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_INVAL,
"Incorrect message size"); /* Informative enough error message? */ "Incorrect message size"); /* Informative enough error message? */
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1004,8 +1004,8 @@ g_io_win32_msg_write (GIOChannel *channel,
if (count != sizeof (MSG)) if (count != sizeof (MSG))
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_INVAL, g_set_error_literal (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_INVAL,
"Incorrect message size"); /* Informative enough error message? */ "Incorrect message size"); /* Informative enough error message? */
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1014,7 +1014,7 @@ g_io_win32_msg_write (GIOChannel *channel,
if (!PostMessage (win32_channel->hwnd, msg.message, msg.wParam, msg.lParam)) if (!PostMessage (win32_channel->hwnd, msg.message, msg.wParam, msg.lParam))
{ {
gchar *emsg = g_win32_error_message (GetLastError ()); gchar *emsg = g_win32_error_message (GetLastError ());
g_set_error (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_FAILED, emsg); g_set_error_literal (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_FAILED, emsg);
g_free (emsg); g_free (emsg);
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1111,9 +1111,9 @@ g_io_win32_fd_and_console_read (GIOChannel *channel,
return G_IO_STATUS_AGAIN; return G_IO_STATUS_AGAIN;
#endif #endif
default: default:
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
} }
@ -1154,9 +1154,9 @@ g_io_win32_fd_and_console_write (GIOChannel *channel,
return G_IO_STATUS_AGAIN; return G_IO_STATUS_AGAIN;
#endif #endif
default: default:
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
} }
@ -1197,9 +1197,9 @@ g_io_win32_fd_seek (GIOChannel *channel,
tmp_offset = offset; tmp_offset = offset;
if (tmp_offset != offset) if (tmp_offset != offset)
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (EINVAL), g_io_channel_error_from_errno (EINVAL),
g_strerror (EINVAL)); g_strerror (EINVAL));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1207,9 +1207,9 @@ g_io_win32_fd_seek (GIOChannel *channel,
if (result < 0) if (result < 0)
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1303,9 +1303,9 @@ g_io_win32_console_close (GIOChannel *channel,
if (close (win32_channel->fd) < 0) if (close (win32_channel->fd) < 0)
{ {
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno), g_io_channel_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1377,7 +1377,7 @@ g_io_win32_sock_read (GIOChannel *channel,
error = G_IO_CHANNEL_ERROR_FAILED; error = G_IO_CHANNEL_ERROR_FAILED;
break; break;
} }
g_set_error (err, G_IO_CHANNEL_ERROR, error, emsg); g_set_error_literal (err, G_IO_CHANNEL_ERROR, error, emsg);
g_free (emsg); g_free (emsg);
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
@ -1440,7 +1440,7 @@ g_io_win32_sock_write (GIOChannel *channel,
error = G_IO_CHANNEL_ERROR_FAILED; error = G_IO_CHANNEL_ERROR_FAILED;
break; break;
} }
g_set_error (err, G_IO_CHANNEL_ERROR, error, emsg); g_set_error_literal (err, G_IO_CHANNEL_ERROR, error, emsg);
g_free (emsg); g_free (emsg);
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
@ -1600,9 +1600,9 @@ g_io_channel_new_file (const gchar *filename,
if (fid < 0) if (fid < 0)
{ {
g_set_error (error, G_FILE_ERROR, g_set_error_literal (error, G_FILE_ERROR,
g_file_error_from_errno (errno), g_file_error_from_errno (errno),
g_strerror (errno)); g_strerror (errno));
return (GIOChannel *)NULL; return (GIOChannel *)NULL;
} }
@ -1677,9 +1677,9 @@ g_io_win32_unimpl_set_flags (GIOChannel *channel,
g_print ("\n"); g_print ("\n");
} }
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED, G_IO_CHANNEL_ERROR_FAILED,
"Not implemented on Win32"); "Not implemented on Win32");
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -1785,9 +1785,9 @@ g_io_win32_sock_set_flags (GIOChannel *channel,
{ {
gchar *emsg = g_win32_error_message (WSAGetLastError ()); gchar *emsg = g_win32_error_message (WSAGetLastError ());
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED, G_IO_CHANNEL_ERROR_FAILED,
emsg); emsg);
g_free (emsg); g_free (emsg);
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
@ -1800,9 +1800,9 @@ g_io_win32_sock_set_flags (GIOChannel *channel,
{ {
gchar *emsg = g_win32_error_message (WSAGetLastError ()); gchar *emsg = g_win32_error_message (WSAGetLastError ());
g_set_error (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED, G_IO_CHANNEL_ERROR_FAILED,
emsg); emsg);
g_free (emsg); g_free (emsg);
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;

52
glib/gkeyfile.c
View File

@ -353,10 +353,10 @@ find_file_in_data_dirs (const gchar *file,
if (fd < 0) if (fd < 0)
{ {
g_set_error (error, G_KEY_FILE_ERROR, g_set_error_literal (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_NOT_FOUND, G_KEY_FILE_ERROR_NOT_FOUND,
_("Valid key file could not be " _("Valid key file could not be "
"found in search dirs")); "found in search dirs"));
} }
if (output_file != NULL && fd > 0) if (output_file != NULL && fd > 0)
@ -380,25 +380,25 @@ g_key_file_load_from_fd (GKeyFile *key_file,
if (fstat (fd, &stat_buf) < 0) if (fstat (fd, &stat_buf) < 0)
{ {
g_set_error (error, G_FILE_ERROR, g_set_error_literal (error, G_FILE_ERROR,
g_file_error_from_errno (errno), g_file_error_from_errno (errno),
"%s", g_strerror (errno)); g_strerror (errno));
return FALSE; return FALSE;
} }
if (!S_ISREG (stat_buf.st_mode)) if (!S_ISREG (stat_buf.st_mode))
{ {
g_set_error (error, G_KEY_FILE_ERROR, g_set_error_literal (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE, G_KEY_FILE_ERROR_PARSE,
_("Not a regular file")); _("Not a regular file"));
return FALSE; return FALSE;
} }
if (stat_buf.st_size == 0) if (stat_buf.st_size == 0)
{ {
g_set_error (error, G_KEY_FILE_ERROR, g_set_error_literal (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_PARSE, G_KEY_FILE_ERROR_PARSE,
_("File is empty")); _("File is empty"));
return FALSE; return FALSE;
} }
@ -422,9 +422,9 @@ g_key_file_load_from_fd (GKeyFile *key_file,
if (errno == EINTR || errno == EAGAIN) if (errno == EINTR || errno == EAGAIN)
continue; continue;
g_set_error (error, G_FILE_ERROR, g_set_error_literal (error, G_FILE_ERROR,
g_file_error_from_errno (errno), g_file_error_from_errno (errno),
"%s", g_strerror (errno)); g_strerror (errno));
return FALSE; return FALSE;
} }
@ -482,9 +482,9 @@ g_key_file_load_from_file (GKeyFile *key_file,
if (fd < 0) if (fd < 0)
{ {
g_set_error (error, G_FILE_ERROR, g_set_error_literal (error, G_FILE_ERROR,
g_file_error_from_errno (errno), g_file_error_from_errno (errno),
"%s", g_strerror (errno)); g_strerror (errno));
return FALSE; return FALSE;
} }
@ -838,9 +838,9 @@ g_key_file_parse_key_value_pair (GKeyFile *key_file,
if (key_file->current_group == NULL || key_file->current_group->name == NULL) if (key_file->current_group == NULL || key_file->current_group->name == NULL)
{ {
g_set_error (error, G_KEY_FILE_ERROR, g_set_error_literal (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_GROUP_NOT_FOUND, G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
_("Key file does not start with a group")); _("Key file does not start with a group"));
return; return;
} }
@ -3469,10 +3469,10 @@ g_key_file_parse_value_as_string (GKeyFile *key_file,
break; break;
case '\0': case '\0':
g_set_error (error, G_KEY_FILE_ERROR, g_set_error_literal (error, G_KEY_FILE_ERROR,
G_KEY_FILE_ERROR_INVALID_VALUE, G_KEY_FILE_ERROR_INVALID_VALUE,
_("Key file contains escape character " _("Key file contains escape character "
"at end of line")); "at end of line"));
break; break;
default: default:

4
glib/gregex.c
View File

@ -1097,7 +1097,7 @@ g_regex_new (const gchar *pattern,
{ {
msg = N_("PCRE library is compiled without UTF8 support"); msg = N_("PCRE library is compiled without UTF8 support");
g_critical (msg); g_critical (msg);
g_set_error (error, G_REGEX_ERROR, G_REGEX_ERROR_COMPILE, gettext (msg)); g_set_error_literal (error, G_REGEX_ERROR, G_REGEX_ERROR_COMPILE, gettext (msg));
return NULL; return NULL;
} }
@ -1106,7 +1106,7 @@ g_regex_new (const gchar *pattern,
{ {
msg = N_("PCRE library is compiled without UTF8 properties support"); msg = N_("PCRE library is compiled without UTF8 properties support");
g_critical (msg); g_critical (msg);
g_set_error (error, G_REGEX_ERROR, G_REGEX_ERROR_COMPILE, gettext (msg)); g_set_error_literal (error, G_REGEX_ERROR, G_REGEX_ERROR_COMPILE, gettext (msg));
return NULL; return NULL;
} }

8
glib/gshell.c
View File

@ -551,10 +551,10 @@ tokenize_command_line (const gchar *command_line,
if (retval == NULL) if (retval == NULL)
{ {
g_set_error (error, g_set_error_literal (error,
G_SHELL_ERROR, G_SHELL_ERROR,
G_SHELL_ERROR_EMPTY_STRING, G_SHELL_ERROR_EMPTY_STRING,
_("Text was empty (or contained only whitespace)")); _("Text was empty (or contained only whitespace)"));
goto error; goto error;
} }

8
glib/gspawn-win32.c
View File

@ -275,8 +275,8 @@ read_data (GString *str,
goto again; goto again;
else if (giostatus == G_IO_STATUS_ERROR) else if (giostatus == G_IO_STATUS_ERROR)
{ {
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_READ, g_set_error_literal (error, G_SPAWN_ERROR, G_SPAWN_ERROR_READ,
_("Failed to read data from child process")); _("Failed to read data from child process"));
return READ_FAILED; return READ_FAILED;
} }
@ -998,8 +998,8 @@ g_spawn_sync_utf8 (const gchar *working_directory,
{ {
failed = TRUE; failed = TRUE;
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_READ, g_set_error_literal (error, G_SPAWN_ERROR, G_SPAWN_ERROR_READ,
_("Unexpected error in g_io_channel_win32_poll() reading data from a child process")); _("Unexpected error in g_io_channel_win32_poll() reading data from a child process"));
break; break;
} }

60
glib/gutf8.c
View File

@ -948,12 +948,12 @@ g_utf8_to_ucs4 (const gchar *str,
if (items_read) if (items_read)
break; break;
else else
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Partial character sequence at end of input")); _("Partial character sequence at end of input"));
} }
else else
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid byte sequence in conversion input")); _("Invalid byte sequence in conversion input"));
goto err_out; goto err_out;
} }
@ -1026,8 +1026,8 @@ g_ucs4_to_utf8 (const gunichar *str,
if (str[i] >= 0x80000000) if (str[i] >= 0x80000000)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Character out of range for UTF-8")); _("Character out of range for UTF-8"));
goto err_out; goto err_out;
} }
@ -1120,8 +1120,8 @@ g_utf16_to_utf8 (const gunichar2 *str,
} }
else else
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid sequence in conversion input")); _("Invalid sequence in conversion input"));
goto err_out; goto err_out;
} }
} }
@ -1129,8 +1129,8 @@ g_utf16_to_utf8 (const gunichar2 *str,
{ {
if (high_surrogate) if (high_surrogate)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid sequence in conversion input")); _("Invalid sequence in conversion input"));
goto err_out; goto err_out;
} }
@ -1152,8 +1152,8 @@ g_utf16_to_utf8 (const gunichar2 *str,
if (high_surrogate && !items_read) if (high_surrogate && !items_read)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Partial character sequence at end of input")); _("Partial character sequence at end of input"));
goto err_out; goto err_out;
} }
@ -1261,8 +1261,8 @@ g_utf16_to_ucs4 (const gunichar2 *str,
} }
else else
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid sequence in conversion input")); _("Invalid sequence in conversion input"));
goto err_out; goto err_out;
} }
} }
@ -1270,8 +1270,8 @@ g_utf16_to_ucs4 (const gunichar2 *str,
{ {
if (high_surrogate) if (high_surrogate)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid sequence in conversion input")); _("Invalid sequence in conversion input"));
goto err_out; goto err_out;
} }
@ -1293,8 +1293,8 @@ g_utf16_to_ucs4 (const gunichar2 *str,
if (high_surrogate && !items_read) if (high_surrogate && !items_read)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Partial character sequence at end of input")); _("Partial character sequence at end of input"));
goto err_out; goto err_out;
} }
@ -1397,12 +1397,12 @@ g_utf8_to_utf16 (const gchar *str,
if (items_read) if (items_read)
break; break;
else else
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_PARTIAL_INPUT,
_("Partial character sequence at end of input")); _("Partial character sequence at end of input"));
} }
else else
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid byte sequence in conversion input")); _("Invalid byte sequence in conversion input"));
goto err_out; goto err_out;
} }
@ -1411,8 +1411,8 @@ g_utf8_to_utf16 (const gchar *str,
n16 += 1; n16 += 1;
else if (wc < 0xe000) else if (wc < 0xe000)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid sequence in conversion input")); _("Invalid sequence in conversion input"));
goto err_out; goto err_out;
} }
@ -1422,8 +1422,8 @@ g_utf8_to_utf16 (const gchar *str,
n16 += 2; n16 += 2;
else else
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Character out of range for UTF-16")); _("Character out of range for UTF-16"));
goto err_out; goto err_out;
} }
@ -1507,8 +1507,8 @@ g_ucs4_to_utf16 (const gunichar *str,
n16 += 1; n16 += 1;
else if (wc < 0xe000) else if (wc < 0xe000)
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Invalid sequence in conversion input")); _("Invalid sequence in conversion input"));
goto err_out; goto err_out;
} }
@ -1518,8 +1518,8 @@ g_ucs4_to_utf16 (const gunichar *str,
n16 += 2; n16 += 2;
else else
{ {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
_("Character out of range for UTF-16")); _("Character out of range for UTF-16"));
goto err_out; goto err_out;
} }