Author: jplevyak
Date: Thu May 20 23:46:53 2010
New Revision: 946827
URL: http://svn.apache.org/viewvc?rev=946827&view=rev
Log:
Cleanup some cruft left over from windows
Modified:
trafficserver/traffic/trunk/libinktomi++/Diags.cc
trafficserver/traffic/trunk/libinktomi++/Diags.h
trafficserver/traffic/trunk/libinktomi++/ink_error.h
Modified: trafficserver/traffic/trunk/libinktomi++/Diags.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Diags.cc?rev=946827&r1=946826&r2=946827&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Diags.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/Diags.cc Thu May 20 23:46:53 2010
@@ -186,7 +186,7 @@ Diags::~Diags()
void
Diags::print_va(const char *debug_tag, DiagsLevel diags_level,
const char *prefix, SrcLoc * loc,
- const char *format_string, va_list ap, unsigned int wID, eInsertStringType eIST)
+ const char *format_string, va_list ap)
{
struct timeval tp;
const char *prefix_string, *s;
@@ -554,26 +554,6 @@ DiagsEClosure::operator() (const char *f
va_end(ap);
}
-
-// default: no location printed
-void
-DiagsEClosure::operator() (unsigned long wID, eInsertStringType eIST, const char *format_string ...)
-{
- va_list ap;
- va_start(ap, format_string);
- SrcLoc *lp = (diags->show_location ? &src_location : NULL);
- diags->print_va(NULL, level, NULL, lp, format_string, ap, wID, eIST);
- va_end(ap);
- va_start(ap, format_string);
- if (DiagsLevel_IsTerminal(level)) {
- if (diags->cleanup_func)
- diags->cleanup_func();
- ink_fatal_va(1, (char *) format_string, ap);
- }
- va_end(ap);
-}
-
-
// location optionally printed
void
DiagsEClosure::operator() (int show_loc, const char *format_string ...)
Modified: trafficserver/traffic/trunk/libinktomi++/Diags.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Diags.h?rev=946827&r1=946826&r2=946827&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Diags.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/Diags.h Thu May 20 23:46:53 2010
@@ -188,8 +188,8 @@ public:
const char *level_name(DiagsLevel dl);
inkcoreapi void print_va(const char *tag, DiagsLevel dl, const char *prefix,
- SrcLoc * loc, const char *format_string, va_list ap,
- unsigned int wID = 0, eInsertStringType eIST = keNo_OP);
+ SrcLoc * loc, const char *format_string, va_list ap);
+
//////////////////////////////
// user printing interfaces //
@@ -341,9 +341,6 @@ public:
// default: no location printed
void inkcoreapi operator() (const char *format_string ...);
- // default: no location printed
- void operator() (unsigned long wID, eInsertStringType eIST, const char *format_string ...);
-
// location optionally printed
void operator() (int show_loc, const char *format_string ...);
};
Modified: trafficserver/traffic/trunk/libinktomi++/ink_error.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_error.h?rev=946827&r1=946826&r2=946827&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_error.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_error.h Thu May 20 23:46:53 2010
@@ -39,34 +39,23 @@
#include "ink_defs.h"
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif /* __cplusplus */
-/* used all over the place - currently used by NT only. */
- typedef enum
- {
- keNo_OP = 0,
- keENCAPSULATED_STRING = 1,
- keINSERT_STRING = 2
- } eInsertStringType;
-
-
- inkcoreapi void ink_fatal_va(int return_code, const char *message_format, va_list ap);
- void ink_fatal(int return_code, const char *message_format, ...) PRINTFLIKE(2, 3);
- void ink_pfatal(int return_code, const char *message_format, ...) PRINTFLIKE(2, 3);
- void ink_warning(const char *message_format, ...) PRINTFLIKE(1, 2);
- void ink_pwarning(const char *message_format, ...) PRINTFLIKE(1, 2);
- void ink_notice(const char *message_format, ...) PRINTFLIKE(1, 2);
- void ink_eprintf(const char *message_format, ...) PRINTFLIKE(1, 2);
- void ink_error(const char *message_format, ...) PRINTFLIKE(1, 2);
- void ink_dprintf(int debug_level, const char *message_format, ...) PRINTFLIKE(2, 3);
- void ink_fatal_die(const char *message_format, ...) PRINTFLIKE(1, 2);
-
- void ink_die_die_die(int retval);
- void ink_segv();
- int ink_set_dprintf_level(int debug_level);
-
+inkcoreapi void ink_fatal_va(int return_code, const char *message_format, va_list ap);
+void ink_fatal(int return_code, const char *message_format, ...) PRINTFLIKE(2, 3);
+void ink_pfatal(int return_code, const char *message_format, ...) PRINTFLIKE(2, 3);
+void ink_warning(const char *message_format, ...) PRINTFLIKE(1, 2);
+void ink_pwarning(const char *message_format, ...) PRINTFLIKE(1, 2);
+void ink_notice(const char *message_format, ...) PRINTFLIKE(1, 2);
+void ink_eprintf(const char *message_format, ...) PRINTFLIKE(1, 2);
+void ink_error(const char *message_format, ...) PRINTFLIKE(1, 2);
+void ink_dprintf(int debug_level, const char *message_format, ...) PRINTFLIKE(2, 3);
+void ink_fatal_die(const char *message_format, ...) PRINTFLIKE(1, 2);
+
+void ink_die_die_die(int retval);
+void ink_segv();
+int ink_set_dprintf_level(int debug_level);
#ifdef __cplusplus
}