From 51b01aa724ddf077c155ec4d2a79ca21e720b537 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Mar 2012 18:04:02 +0000 Subject: prepending kpathsea: to warnings git-svn-id: svn://tug.org/texlive/trunk@25603 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 4 ++++ Build/source/texk/kpathsea/cnf.c | 6 +++--- Build/source/texk/kpathsea/db.c | 4 ++-- Build/source/texk/kpathsea/expand.c | 7 ++++--- Build/source/texk/kpathsea/fontmap.c | 8 ++++---- Build/source/texk/kpathsea/progname.c | 19 ++++++++++--------- Build/source/texk/kpathsea/readable.c | 4 ++-- Build/source/texk/kpathsea/tex-file.c | 4 ++-- Build/source/texk/kpathsea/tex-make.c | 7 ++++--- Build/source/texk/kpathsea/variable.c | 7 ++++--- 10 files changed, 39 insertions(+), 31 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 355e77eb39b..0e6ff90c0fc 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,7 @@ +2012-03-11 Karl Berry + + * *.c: prepend kpathsea: to warnings. + 2012-03-04 Peter Breitenlohner Avoid 'the address of XXX will always evaluate as true' warnings. diff --git a/Build/source/texk/kpathsea/cnf.c b/Build/source/texk/kpathsea/cnf.c index 1eac745261a..1f9dc744c88 100644 --- a/Build/source/texk/kpathsea/cnf.c +++ b/Build/source/texk/kpathsea/cnf.c @@ -1,6 +1,6 @@ /* cnf.c: read config files. - Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011 Karl Berry. + Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012 Karl Berry. Copyright 1997-2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -193,7 +193,7 @@ read_all_cnf (kpathsea kpse) string next_line = read_line (cnf_file); line[len - 1] = 0; if (!next_line) { - WARNING1 ("%s: Last line ends with \\", *cnf); + WARNING1 ("kpathsea: %s: Last line of file ends with \\", *cnf); } else { string new_line; new_line = concat (line, next_line); @@ -215,7 +215,7 @@ read_all_cnf (kpathsea kpse) string warn = getenv ("KPATHSEA_WARNING"); if (!(warn && STREQ (warn, "0"))) { WARNING1 - ("kpathsea: configuration file texmf.cnf not found in these directories: %s", + ("kpathsea: configuration file texmf.cnf not found in these directories: %s", cnf_path); } } diff --git a/Build/source/texk/kpathsea/db.c b/Build/source/texk/kpathsea/db.c index ef3dd026faa..76f7763d790 100644 --- a/Build/source/texk/kpathsea/db.c +++ b/Build/source/texk/kpathsea/db.c @@ -1,6 +1,6 @@ /* db.c: an external database to avoid filesystem lookups. - Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011 Karl Berry. + Copyright 1994, 1995, 1996, 1997, 2008, 2009, 2011, 2012 Karl Berry. Copyright 1997-2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -155,7 +155,7 @@ db_build (kpathsea kpse, hash_table_type *table, const_string db_filename) xfclose (db_file, db_filename); if (file_count == 0) { - WARNING1 ("kpathsea: No usable entries in %s", db_filename); + WARNING1 ("kpathsea: %s: No usable entries in ls-R", db_filename); WARNING ("kpathsea: See the manual for how to generate ls-R"); db_file = NULL; } else { diff --git a/Build/source/texk/kpathsea/expand.c b/Build/source/texk/kpathsea/expand.c index 6084b9c8d92..d9eadd4bc14 100644 --- a/Build/source/texk/kpathsea/expand.c +++ b/Build/source/texk/kpathsea/expand.c @@ -1,7 +1,8 @@ /* expand.c: general expansion. - Copyright 1993, 1994, 1995, 1996, 1997, 1998, 2005, 2008, 2009, 2011 - Karl Berry & Olaf Weber. + Copyright 1993, 1994, 1995, 1996, 1997, 2005, 2008, 2009, 2011, + 2012 Karl Berry. + Copyright 1997-2005 Olaf Weber. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -333,7 +334,7 @@ brace_expand (kpathsea kpse, const_string *text) str_list_free(&recurse); /* Check for missing closing brace. */ if (*p != '}') { - WARNING1 ("%s: Unmatched {", *text); + WARNING1 ("kpathsea: %s: Unmatched {", *text); } *text = p+1; } else if (*p == '$') { diff --git a/Build/source/texk/kpathsea/fontmap.c b/Build/source/texk/kpathsea/fontmap.c index 3dce91843dc..e878104188d 100644 --- a/Build/source/texk/kpathsea/fontmap.c +++ b/Build/source/texk/kpathsea/fontmap.c @@ -1,7 +1,7 @@ /* fontmap.c: read files for additional font names. + Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2011, 2012 Karl Berry. Copyright 2001, 2002, 2005 Olaf Weber. - Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2011 Karl Berry. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -107,7 +107,7 @@ map_file_parse (kpathsea kpse, const_string map_filename) if (STREQ (filename, "include")) { if (alias == NULL) { - WARNING2 ("%s:%u: Filename argument for include directive missing", + WARNING2 ("kpathsea: %s:%u: Filename argument for include directive missing", map_filename, map_lineno); } else { string include_fname = kpathsea_path_search (kpse, @@ -117,7 +117,7 @@ map_file_parse (kpathsea kpse, const_string map_filename) if (include_fname != alias) free (include_fname); } else { - WARNING3 ("%s:%u: Can't find fontname include file `%s'", + WARNING3 ("kpathsea: %s:%u: Can't find fontname include file `%s'", map_filename, map_lineno, alias); } free (alias); @@ -126,7 +126,7 @@ map_file_parse (kpathsea kpse, const_string map_filename) /* But if we have a filename and no alias, something's wrong. */ } else if (alias == NULL) { - WARNING3 ("%s:%u: Fontname alias missing for filename `%s'", + WARNING3 ("kpathsea: %s:%u: Fontname alias missing for filename `%s'", map_filename, map_lineno, filename); free (filename); diff --git a/Build/source/texk/kpathsea/progname.c b/Build/source/texk/kpathsea/progname.c index 678e0118247..ee5cfaff659 100644 --- a/Build/source/texk/kpathsea/progname.c +++ b/Build/source/texk/kpathsea/progname.c @@ -1,6 +1,6 @@ /* progname.c: the executable name we were invoked as; general initialization. - Copyright 1994, 1996, 1997, 2008, 2009, 2010, 2011 Karl Berry. + Copyright 1994, 1996, 1997, 2008, 2009, 2010, 2011, 2012 Karl Berry. Copyright 1998-2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -546,17 +546,18 @@ kpathsea_set_program_name (kpathsea kpse, const_string argv0, if ((err < 0) && (err = _open(debug_output, flags, _S_IREAD | _S_IWRITE)) == -1) { - WARNING1("Can't open %s for stderr redirection!\n", debug_output); - perror(debug_output); + WARNING1 ("kpathsea: Can't open %s for stderr redirection!\n", + debug_output); + perror (debug_output); } else if ((olderr = _dup(fileno(stderr))) == -1) { - WARNING("Can't dup() stderr!\n"); - close(err); + WARNING ("kpathsea: Can't dup() stderr!\n"); + close (err); } else if (_dup2(err, fileno(stderr)) == -1) { - WARNING1("Can't redirect stderr to %s!\n", debug_output); - close(olderr); - close(err); + WARNING1 ("kpathsea: Can't redirect stderr to %s!\n", debug_output); + close (olderr); + close (err); } else { - close(err); + close (err); } } diff --git a/Build/source/texk/kpathsea/readable.c b/Build/source/texk/kpathsea/readable.c index 8f6b5d12be0..c32b2302d15 100644 --- a/Build/source/texk/kpathsea/readable.c +++ b/Build/source/texk/kpathsea/readable.c @@ -1,6 +1,6 @@ /* readable.c: check if a filename is a readable non-directory file. - Copyright 1993, 1995, 1996, 2008, 2011 Karl Berry. + Copyright 1993, 1995, 1996, 2008, 2011, 2012 Karl Berry. Copyright 1998, 1999, 2000, 2001, 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -34,7 +34,7 @@ #define READABLE(fn, st) \ (access (fn, R_OK) == 0 && access (fn, D_OK) == -1) #elif defined (WIN32) -/* Warning: st must be an unsigned int under Win32 */ +/* st must be an unsigned int under Windows */ static boolean READABLE(const_string fn, unsigned int st) { diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c index 0cb119721bf..77088e1e539 100644 --- a/Build/source/texk/kpathsea/tex-file.c +++ b/Build/source/texk/kpathsea/tex-file.c @@ -1,7 +1,7 @@ /* tex-file.c: high-level file searching by format. Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008, 2009, 2010, 2011 - Karl Berry. + 2012 Karl Berry. Copyright 1998-2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -125,7 +125,7 @@ kpathsea_init_fallback_resolutions (kpathsea kpse, string envvar) s = atoi (size); if (size_count && s < last_resort_sizes[size_count - 1]) { - WARNING1 ("kpathsea: last resort size %s not in ascending order, ignored", + WARNING1 ("kpathsea: last resort size %s not in ascending order; ignored", size); } else { size_count++; diff --git a/Build/source/texk/kpathsea/tex-make.c b/Build/source/texk/kpathsea/tex-make.c index e54a0d4a368..7619d244ea7 100644 --- a/Build/source/texk/kpathsea/tex-make.c +++ b/Build/source/texk/kpathsea/tex-make.c @@ -1,6 +1,7 @@ /* tex-make.c: run external programs to make TeX-related files. - Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2009, 2010, 2011 Karl Berry. + Copyright 1993, 1994, 1995, 1996, 1997, 2008, 2009, 2010, 2011, + 2012 Karl Berry. Copyright 1997, 1998, 2001-05 Olaf Weber. This library is free software; you can redistribute it and/or @@ -383,8 +384,8 @@ maketex (kpathsea kpse, kpse_file_format_type format, string* args) ret = len == 0 ? NULL : kpathsea_readable_file (kpse, fn); if (!ret && len > 1) { - WARNING2("kpathsea: %s output `%s' instead of a filename", - args[0], fn); + WARNING2 ("kpathsea: %s output `%s' instead of a filename", + args[0], fn); } /* Free the name if we're not returning it. */ diff --git a/Build/source/texk/kpathsea/variable.c b/Build/source/texk/kpathsea/variable.c index 4198f043d10..f2072441ab8 100644 --- a/Build/source/texk/kpathsea/variable.c +++ b/Build/source/texk/kpathsea/variable.c @@ -1,6 +1,6 @@ /* variable.c: variable expansion. - Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011 Karl Berry. + Copyright 1993, 1994, 1995, 1996, 2008, 2009, 2011, 2012 Karl Berry. Copyright 1997, 1999, 2001, 2002, 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -229,7 +229,7 @@ kpathsea_var_expand (kpathsea kpse, const_string src) } if (! *var_end) { - WARNING1 ("%s: No matching } for ${", src); + WARNING1 ("kpathsea: %s: No matching } for ${", src); s = var_end - 1; /* will incr to null at top of loop */ } else { expand (kpse, &expansion, s, var_end - 1); @@ -239,7 +239,8 @@ kpathsea_var_expand (kpathsea kpse, const_string src) } else { /* $: warn, but preserve characters; again, so filenames containing dollar signs can be read. */ - WARNING2 ("%s: Unrecognized variable construct `$%c'", src, *s); + WARNING2 ("kpathsea: %s: Unrecognized variable construct `$%c'", + src, *s); fn_grow (&expansion, s - 1, 2); /* moved past the $ */ } } else -- cgit v1.2.3