diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-04-19 00:37:44 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-04-19 00:37:44 +0000 |
| commit | b459976e27aee31b9be3b31cb6c95f35226f1a57 (patch) | |
| tree | edf941bf30502ce53a4d23da6146e758c0960b23 /locale/programs | |
| parent | d648d845b476e7638567b53590b8c1979507b3f3 (diff) | |
| download | glibc-b459976e27aee31b9be3b31cb6c95f35226f1a57.tar.gz glibc-b459976e27aee31b9be3b31cb6c95f35226f1a57.tar.xz glibc-b459976e27aee31b9be3b31cb6c95f35226f1a57.zip | |
Update.
* iconv/skeleton.c (RESET_INPUT_BUFFER): Replace ifs with #ifs to avoid compiler warnings. * locale/programs/localedef.c (main): Always call construct_output_path.
Diffstat (limited to 'locale/programs')
| -rw-r--r-- | locale/programs/localedef.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 526f2025e7..ba8572e9e5 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -223,18 +223,10 @@ main (int argc, char *argv[]) /* The parameter describes the output path of the constructed files. If the described files cannot be written return a NULL pointer. */ - if (no_archive) - { - output_path = construct_output_path (argv[remaining]); - if (output_path == NULL) - error (4, errno, _("cannot create directory for output files")); - cannot_write_why = errno; - } - else - { - output_path = NULL; - cannot_write_why = 0; /* Just to shut the compiler up. */ - } + output_path = construct_output_path (argv[remaining]); + if (output_path == NULL && ! no_archive) + error (4, errno, _("cannot create directory for output files")); + cannot_write_why = errno; /* Now that the parameters are processed we have to reset the local ctype locale. (P1003.2 4.35.5.2) */ |