diff options
| author | Kevin Koch <kpkoch@mit.edu> | 2008-01-22 18:34:26 +0000 |
|---|---|---|
| committer | Kevin Koch <kpkoch@mit.edu> | 2008-01-22 18:34:26 +0000 |
| commit | faf9366d3111f171e157b1e45ba7b49d5a529903 (patch) | |
| tree | 9b87ceb846e36b9df3e8f4918a4b0882c4700d97 | |
| parent | 71bc89ed452de3b5aa6356087280554e58ae4456 (diff) | |
| download | krb5-faf9366d3111f171e157b1e45ba7b49d5a529903.zip krb5-faf9366d3111f171e157b1e45ba7b49d5a529903.tar.gz krb5-faf9366d3111f171e157b1e45ba7b49d5a529903.tar.bz2 | |
Windows debug message line endings were already correct; revert cci_debugging.c.
Declare cci_thread_init__auxinit instead of defining a new function.
TargetVersion: 1.7
Component: krb5-libs
Ticket: 5594
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20202 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/ccapi/common/cci_debugging.c | 12 | ||||
| -rw-r--r-- | src/ccapi/lib/ccapi_context.c | 6 | ||||
| -rw-r--r-- | src/ccapi/lib/ccapi_context.h | 2 |
3 files changed, 4 insertions, 16 deletions
diff --git a/src/ccapi/common/cci_debugging.c b/src/ccapi/common/cci_debugging.c index e359261..4545b40 100644 --- a/src/ccapi/common/cci_debugging.c +++ b/src/ccapi/common/cci_debugging.c @@ -1,7 +1,7 @@ /* * $Header$ * - * Copyright 2007, 2008 Massachusetts Institute of Technology. + * Copyright 2006 Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -27,12 +27,6 @@ #include "cci_common.h" #include "cci_os_debugging.h" -#ifdef WIN32 -char* eol = "\n"; -#else -char* eol = ""; -#endif - /* ------------------------------------------------------------------------ */ cc_int32 _cci_check_error (cc_int32 in_error, @@ -42,8 +36,8 @@ cc_int32 _cci_check_error (cc_int32 in_error, { /* Do not log for flow control errors or when there is no error at all */ if (in_error != ccNoError && in_error != ccIteratorEnd) { - cci_debug_printf ("%s() got %d at %s: %d%s", in_function, - in_error, in_file, in_line, eol); + cci_debug_printf ("%s() got %d at %s: %d", in_function, + in_error, in_file, in_line); } return in_error; diff --git a/src/ccapi/lib/ccapi_context.c b/src/ccapi/lib/ccapi_context.c index 6bcbd23..7a165cf 100644 --- a/src/ccapi/lib/ccapi_context.c +++ b/src/ccapi/lib/ccapi_context.c @@ -81,12 +81,6 @@ static cc_int32 cci_context_sync (cci_context_t in_context, MAKE_INIT_FUNCTION(cci_thread_init); -#ifdef WIN32 -void cci_thread_init_helper() { - cci_thread_init__auxinit(); - } -#endif - /* ------------------------------------------------------------------------ */ static int cci_thread_init (void) diff --git a/src/ccapi/lib/ccapi_context.h b/src/ccapi/lib/ccapi_context.h index a9989a1..7462a05 100644 --- a/src/ccapi/lib/ccapi_context.h +++ b/src/ccapi/lib/ccapi_context.h @@ -76,7 +76,7 @@ cc_int32 ccapi_context_compare (cc_context_t in_context, cc_uint32 *out_equal); #ifdef WIN32 -void cci_thread_init_helper(); +void cci_thread_init__auxinit(); #endif |