summaryrefslogtreecommitdiff
path: root/iconv/iconv_prog.c
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-02-01 12:22:55 +0100
committerAndreas Schwab <schwab@redhat.com>2010-02-01 12:22:55 +0100
commit5229ffc381ccf5897ca83be5891051c7607638f6 (patch)
tree0acfe4328875230186f82ff09a1e07e1df9373d0 /iconv/iconv_prog.c
parentb675f5a8621ca898e64d0bf51d7fa1469322f861 (diff)
parentb34e12e22c00d74ee549ae9ac304f64d1d6374d5 (diff)
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'iconv/iconv_prog.c')
-rw-r--r--iconv/iconv_prog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index a1ca05f153..3bcb9b464e 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -442,7 +442,7 @@ write_output (const char *outbuf, const char *outptr, FILE **output,
if (output_file != NULL && strcmp (output_file, "-") != 0)
{
*output = fopen (output_file, "w");
- if (output == NULL)
+ if (*output == NULL)
error (EXIT_FAILURE, errno, _("cannot open output file"));
}
else