luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 19:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant checks

Browse Source 
g_set_error() handles error == NULL, so no need to check.
Patch by Ignacio Casal Quinteiro.

https://bugzilla.gnome.org/show_bug.cgi?id=640975
This commit is contained in:
Matthias Clasen 2011-09-17 20:27:16 -04:00
parent f18eab2ac7
commit 7b9571e4dd
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gconvert.c
View File

@ -763,13 +763,11 @@ g_convert_with_iconv (const gchar *str,
} }
break; break;
case EILSEQ: case EILSEQ:
if (error)
g_set_error_literal (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:
if (error)
{ {
int errsv = errno; int errsv = errno;
@ -804,7 +802,6 @@ g_convert_with_iconv (const gchar *str,
{ {
if (!have_error) if (!have_error)
{ {
if (error)
g_set_error_literal (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;