summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-03-24 17:26:48 +0000
committerKarl Berry <karl@freefriends.org>2014-03-24 17:26:48 +0000
commit4f3b9c7ff161d965270d1ad1370d522df78fe64a (patch)
tree38f4c1005d0bd12952c05f89fc3e8ae28f178ea3
parent09b90777f7c6bab6a375c51d664750185bda747d (diff)
program ident in warnings and errors instead of shouting with **
git-svn-id: svn://tug.org/texlive/trunk@33272 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog6
-rw-r--r--Build/source/texk/dvipdfm-x/error.c5
-rw-r--r--Build/source/texk/dvipdfm-x/tt_table.c6
3 files changed, 12 insertions, 5 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 8d3a7ccb052..7c3be8c29f0 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-24 Karl Berry <karl@tug.org>
+
+ * error.c (WARN, ERROR): use my_name, not loud stars.
+ #include "dvipdfmx.h" for decl.
+ * tt_table.c: use WARN for warnings, not fprintf.
+
2014-03-20 Karl Berry <karl@tug.org>
* dvipdfmx.c (show_version): eliminate useless leading blank line.
diff --git a/Build/source/texk/dvipdfm-x/error.c b/Build/source/texk/dvipdfm-x/error.c
index 055f5dbe3d2..ab959caa275 100644
--- a/Build/source/texk/dvipdfm-x/error.c
+++ b/Build/source/texk/dvipdfm-x/error.c
@@ -27,6 +27,7 @@
#include <stdarg.h>
#include <stdio.h>
+#include "dvipdfmx.h"
#include "error.h"
#define DPX_MESG 0
@@ -65,7 +66,7 @@ WARN (const char *fmt, ...)
if (really_quiet < 2) {
if (WANT_NEWLINE())
fprintf(stderr, "\n");
- fprintf(stderr, "** WARNING ** ");
+ fprintf(stderr, "%s:warning: ", my_name);
va_start(argp, fmt);
vfprintf(stderr, fmt, argp);
va_end(argp);
@@ -83,7 +84,7 @@ ERROR (const char *fmt, ...)
if (really_quiet < 3) {
if (WANT_NEWLINE())
fprintf(stderr, "\n");
- fprintf(stderr, "** ERROR ** ");
+ fprintf(stderr, "%s:fatal: ", my_name);
va_start(argp, fmt);
vfprintf(stderr, fmt, argp);
va_end(argp);
diff --git a/Build/source/texk/dvipdfm-x/tt_table.c b/Build/source/texk/dvipdfm-x/tt_table.c
index ff974826909..0fa1ad77b71 100644
--- a/Build/source/texk/dvipdfm-x/tt_table.c
+++ b/Build/source/texk/dvipdfm-x/tt_table.c
@@ -455,7 +455,7 @@ tt_get_name (sfnt *sfont, char *dest, USHORT destlen,
if ((p_id == plat_id) && (e_id == enco_id) &&
(lang_id == 0xffffu || l_id == lang_id) && (n_id == name_id)) {
if (length > destlen - 1) {
- fprintf(stderr, "\n** Notice: Name string too long. Truncating **\n");
+ WARN ("Name string too long (%u), truncating to %u", length, destlen);
length = destlen - 1;
}
sfnt_seek_set (sfont, name_offset+string_offset+offset);
@@ -495,9 +495,9 @@ tt_get_ps_fontname (sfnt *sfont, char *dest, USHORT destlen)
(namelen = tt_get_name(sfont, dest, destlen, 3, 5, 0x412u, 6)) != 0)
return namelen;
- fprintf(stderr, "\n** Warning: No valid PostScript name available **\n");
+ WARN ("No valid PostScript name available");
/*
- Wrokaround for some bad TTfonts:
+ Workaround for some bad TTfonts:
Language ID value 0xffffu for `accept any language ID'
*/
if ((namelen = tt_get_name(sfont, dest, destlen, 1, 0, 0xffffu, 6)) == 0) {