diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2009-08-13 12:42:36 +0300 |
---|---|---|
committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-08-13 12:42:36 +0300 |
commit | a4165d0584376d948c213ec93c6065d24ff6a5e7 (patch) | |
tree | bd1a87c3d044f166f634781e166dc981f4449894 | |
parent | Add xz man page to manfiles in toplevel Makefile.am. (diff) | |
download | xz-a4165d0584376d948c213ec93c6065d24ff6a5e7.tar.xz |
Sync some error messages from xz to xzdec.
Make xz error message translation usable outside
xz (at least in upcoming lzmainfo).
-rw-r--r-- | src/xz/main.c | 4 | ||||
-rw-r--r-- | src/xzdec/xzdec.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/xz/main.c b/src/xz/main.c index 868d2888..4121f8d4 100644 --- a/src/xz/main.c +++ b/src/xz/main.c @@ -54,8 +54,8 @@ my_exit(enum exit_status_type status) // If it was fclose() that failed, we have the reason // in errno. If only ferror() indicated an error, // we have no idea what the reason was. - message(V_ERROR, _("Writing to standard output " - "failed: %s"), + message(V_ERROR, "%s: %s", _("Writing to standard " + "output failed"), fclose_err ? strerror(errno) : _("Unknown error")); status = E_ERROR; diff --git a/src/xzdec/xzdec.c b/src/xzdec/xzdec.c index 4827fc60..e99934f5 100644 --- a/src/xzdec/xzdec.c +++ b/src/xzdec/xzdec.c @@ -76,7 +76,7 @@ my_exit(void) // If it was fclose() that failed, we have the reason // in errno. If only ferror() indicated an error, // we have no idea what the reason was. - my_errorf("Cannot write to standard output: %s", fclose_err + my_errorf("Writing to standard output failed: %s", fclose_err ? strerror(errno) : "Unknown error"); status = EXIT_FAILURE; } @@ -320,7 +320,7 @@ uncompress(lzma_stream *strm, FILE *file, const char *filename) // FIXME: Maybe also LZMA_MEMLIMIT_ERROR in future? if (ret != LZMA_OK) { my_errorf("%s", ret == LZMA_MEM_ERROR ? strerror(ENOMEM) - : "Internal program error (bug)"); + : "Internal error (bug)"); exit(EXIT_FAILURE); } @@ -427,7 +427,7 @@ uncompress(lzma_stream *strm, FILE *file, const char *filename) break; default: - msg = "Internal program error (bug)"; + msg = "Internal error (bug)"; break; } |