diff options
| author | Sam Hartman <hartmans@mit.edu> | 1997-03-01 17:28:23 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 1997-03-01 17:28:23 +0000 |
| commit | 22b123104922e7ae172be2beea050c2ef8497805 (patch) | |
| tree | 82a04f1873314f7d5b6224201df6573fd5c9d47e /src | |
| parent | e273e03d6334f890dfa249f50a2ee2bc4bac46a4 (diff) | |
| download | krb5-22b123104922e7ae172be2beea050c2ef8497805.tar.gz krb5-22b123104922e7ae172be2beea050c2ef8497805.tar.xz krb5-22b123104922e7ae172be2beea050c2ef8497805.zip | |
* com_err.c: Back out last change; it's not needed. Also, remove
debugging cruft.
* com_err.h: Do not declare com_err_hook extern if you declare it static in the source. [383]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9992 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/et/ChangeLog | 4 | ||||
| -rw-r--r-- | src/util/et/com_err.c | 7 | ||||
| -rw-r--r-- | src/util/et/com_err.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index 6b47675c6..b227d8c2c 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,6 +1,8 @@ Sat Mar 1 11:54:02 1997 Sam Hartman <hartmans@luminous.MIT.EDU> - * com_err.c: Make com_err_hook global instead of static to work around either NetBSD or Gcc bug.[383] + * com_err.h: Do not declare com_err_hook extern if you want it + static in the source file. [383] + Sat Feb 22 12:18:47 1997 Richard Basch <basch@lehman.com> diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c index 9976fc55a..8823e9eb1 100644 --- a/src/util/et/com_err.c +++ b/src/util/et/com_err.c @@ -30,7 +30,7 @@ static void MacMessageBox(errbuf); #endif - et_old_error_hook_func com_err_hook = 0; +static et_old_error_hook_func com_err_hook = 0; static void default_com_err_proc ET_P((const char FAR *whoami, errcode_t code, @@ -98,11 +98,10 @@ KRB5_DLLIMP void KRB5_CALLCONV com_err_va(whoami, code, fmt, ap) const char FAR *fmt; va_list ap; { - et_old_error_hook_func cef = com_err_hook; - if (!cef) + if (!com_err_hook) default_com_err_proc(whoami, code, fmt, ap); else - (cef)(whoami, code, fmt, ap); + (com_err_hook)(whoami, code, fmt, ap); } diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h index c2f5478d2..b425c8023 100644 --- a/src/util/et/com_err.h +++ b/src/util/et/com_err.h @@ -86,7 +86,7 @@ KRB5_DLLIMP extern errcode_t KRB5_CALLCONV remove_error_table * may cause inappropriate display procedures to be called between * applications under non-Unix environments. */ -extern et_old_error_hook_func com_err_hook; + extern et_old_error_hook_func set_com_err_hook ET_P((et_old_error_hook_func)); extern et_old_error_hook_func reset_com_err_hook |