mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 22:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify error message buffer lengths

Browse Source
This commit is contained in:
Camilla Löwy 2017-08-17 14:25:10 +02:00
parent 08737bdc02
commit 0c70eb8d5c
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.c
View File

@ -148,7 +148,7 @@ static void terminate(void)
void _glfwInputError(int code, const char* format, ...) void _glfwInputError(int code, const char* format, ...)
{ {
_GLFWerror* error; _GLFWerror* error;
char description[1024]; char description[_GLFW_MESSAGE_SIZE];
if (format) if (format)
{ {

4
src/internal.h
View File

@ -54,6 +54,8 @@
#define _GLFW_POLL_BUTTONS 2 #define _GLFW_POLL_BUTTONS 2
#define _GLFW_POLL_ALL (_GLFW_POLL_AXES | _GLFW_POLL_BUTTONS) #define _GLFW_POLL_ALL (_GLFW_POLL_AXES | _GLFW_POLL_BUTTONS)
#define _GLFW_MESSAGE_SIZE 1024
typedef int GLFWbool; typedef int GLFWbool;
typedef struct _GLFWerror _GLFWerror; typedef struct _GLFWerror _GLFWerror;
@ -263,7 +265,7 @@ struct _GLFWerror
{ {
_GLFWerror* next; _GLFWerror* next;
int code; int code;
char description[1024]; char description[_GLFW_MESSAGE_SIZE];
}; };
/*! @brief Initialization configuration. /*! @brief Initialization configuration.

4
src/win32_init.c
View File

@ -412,8 +412,8 @@ char* _glfwCreateUTF8FromWideStringWin32(const WCHAR* source)
// //
void _glfwInputErrorWin32(int error, const char* description) void _glfwInputErrorWin32(int error, const char* description)
{ {
WCHAR buffer[1024] = L""; WCHAR buffer[_GLFW_MESSAGE_SIZE] = L"";
char message[2048] = ""; char message[_GLFW_MESSAGE_SIZE] = "";
FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_IGNORE_INSERTS |

2
src/x11_init.c
View File

@ -779,7 +779,7 @@ void _glfwReleaseErrorHandlerX11(void)
// //
void _glfwInputErrorX11(int error, const char* message) void _glfwInputErrorX11(int error, const char* message)
{ {
char buffer[8192]; char buffer[_GLFW_MESSAGE_SIZE];
XGetErrorText(_glfw.x11.display, _glfw.x11.errorCode, XGetErrorText(_glfw.x11.display, _glfw.x11.errorCode,
buffer, sizeof(buffer)); buffer, sizeof(buffer));