Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various error system fixes.

Browse Source
This commit is contained in:
Camilla Berglund 2011-02-09 12:12:52 +01:00
parent 679fef3d5e
commit 1ff78d0fc9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/error.c
View File

@ -65,6 +65,7 @@ void _glfwSetError(int error, const char* description)
//======================================================================== //========================================================================
// Returns the current error value // Returns the current error value
// This function may be called without GLFW having been initialized
//======================================================================== //========================================================================
GLFWAPI int glfwGetError(void) GLFWAPI int glfwGetError(void)
@ -77,6 +78,7 @@ GLFWAPI int glfwGetError(void)
//======================================================================== //========================================================================
// Returns a string representation of the specified error value // Returns a string representation of the specified error value
// This function may be called without GLFW having been initialized
//======================================================================== //========================================================================
GLFWAPI const char* glfwErrorString(int error) GLFWAPI const char* glfwErrorString(int error)
@ -102,8 +104,7 @@ GLFWAPI const char* glfwErrorString(int error)
case GLFW_PLATFORM_ERROR: case GLFW_PLATFORM_ERROR:
return "A platform-specific error occurred"; return "A platform-specific error occurred";
default: default:
// TODO: Set GLFW_INVALID_ENUM here? return "ERROR: UNKNOWN ERROR TOKEN";
return NULL;
} }
} }
@ -116,9 +117,10 @@ GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun)
{ {
if (!_glfwInitialized) if (!_glfwInitialized)
{ {
// TODO: Uhm... Hmm... // We can't call _glfwSetError here as _glfwLibrary is uninitialized
// This should be the only place outside of _glfwSetError where we set
_glfwSetError(GLFW_NOT_INITIALIZED, NULL); // the global error status directly
_glfwError = GLFW_NOT_INITIALIZED;
return; return;
} }