From 034ae1780aa81c1557533319a4c86631c52b44e7 Mon Sep 17 00:00:00 2001 From: Mike Goslin Date: Thu, 21 Dec 2000 03:16:39 +0000 Subject: [PATCH] *** empty log message *** --- panda/src/express/error_utils.cxx | 9 ++++++--- panda/src/express/error_utils.h | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/panda/src/express/error_utils.cxx b/panda/src/express/error_utils.cxx index b57ff98e41..d949dfbd9c 100644 --- a/panda/src/express/error_utils.cxx +++ b/panda/src/express/error_utils.cxx @@ -6,6 +6,7 @@ #include "error_utils.h" #include +#include #if defined(WIN32_VC) #include #endif @@ -14,7 +15,7 @@ // Function: handle_socket_error // Description: //////////////////////////////////////////////////////////////////// -char* +const char* handle_socket_error(void) { #ifndef WIN32 return strerror(errno); @@ -53,7 +54,9 @@ handle_socket_error(void) { case 10093: return "WSAStartup() was not called"; default: - return "Unknown WSA error"; + char errcode[128]; + sprintf(errcode, "Unknown WSA error: %d", WSAGetLastError()); + return errcode; } #endif } @@ -62,7 +65,7 @@ handle_socket_error(void) { // Function: error_to_text // Description: //////////////////////////////////////////////////////////////////// -char* +const char* error_to_text(int err) { switch (err) { case EU_eof: diff --git a/panda/src/express/error_utils.h b/panda/src/express/error_utils.h index 1c6eb8fe19..e789d89e54 100644 --- a/panda/src/express/error_utils.h +++ b/panda/src/express/error_utils.h @@ -60,8 +60,8 @@ enum ErrorUtilCode { EU_error_zlib = -80, }; -EXPCL_PANDAEXPRESS char *handle_socket_error(void); -EXPCL_PANDAEXPRESS char *error_to_text(int err); +EXPCL_PANDAEXPRESS const char *handle_socket_error(void); +EXPCL_PANDAEXPRESS const char *error_to_text(int err); EXPCL_PANDAEXPRESS int get_network_error(void); EXPCL_PANDAEXPRESS int get_write_error(void);