encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed newlines from error messages.

This commit is contained in:
Philipp Wiesemann 2017-03-26 21:00:19 +02:00
parent 00da0824f5
commit 266816b4aa
24 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/nas/SDL_nasaudio.c
View File

@ -116,7 +116,7 @@ LoadNASLibrary(void)
char *err = (char *) alloca(len); char *err = (char *) alloca(len);
SDL_strlcpy(err, origerr, len); SDL_strlcpy(err, origerr, len);
retval = -1; retval = -1;
SDL_SetError("NAS: SDL_LoadObject('%s') failed: %s\n", SDL_SetError("NAS: SDL_LoadObject('%s') failed: %s",
nas_library, err); nas_library, err);
} else { } else {
retval = load_nas_syms(); retval = load_nas_syms();

2
src/events/SDL_gesture.c
View File

@ -374,7 +374,7 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
dist += d; dist += d;
} }
if (numPoints < DOLLARNPOINTS-1) { if (numPoints < DOLLARNPOINTS-1) {
SDL_SetError("ERROR: NumPoints = %i\n",numPoints); SDL_SetError("ERROR: NumPoints = %i", numPoints);
return 0; return 0;
} }
/* copy the last point */ /* copy the last point */

2
src/render/opengl/SDL_render_gl.c
View File

@ -275,7 +275,7 @@ GL_LoadFunctions(GL_RenderData * data)
do { \ do { \
data->func = SDL_GL_GetProcAddress(#func); \ data->func = SDL_GL_GetProcAddress(#func); \
if ( ! data->func ) { \ if ( ! data->func ) { \
return SDL_SetError("Couldn't load GL function %s: %s\n", #func, SDL_GetError()); \ return SDL_SetError("Couldn't load GL function %s: %s", #func, SDL_GetError()); \
} \ } \
} while ( 0 ); } while ( 0 );
#endif /* __SDL_NOGETPROCADDR__ */ #endif /* __SDL_NOGETPROCADDR__ */

2
src/render/opengles/SDL_render_gles.c
View File

@ -197,7 +197,7 @@ static int GLES_LoadFunctions(GLES_RenderData * data)
do { \ do { \
data->func = SDL_GL_GetProcAddress(#func); \ data->func = SDL_GL_GetProcAddress(#func); \
if ( ! data->func ) { \ if ( ! data->func ) { \
return SDL_SetError("Couldn't load GLES function %s: %s\n", #func, SDL_GetError()); \ return SDL_SetError("Couldn't load GLES function %s: %s", #func, SDL_GetError()); \
} \ } \
} while ( 0 ); } while ( 0 );
#define SDL_PROC_OES(ret,func,params) \ #define SDL_PROC_OES(ret,func,params) \

2
src/render/opengles2/SDL_render_gles2.c
View File

@ -297,7 +297,7 @@ static int GLES2_LoadFunctions(GLES2_DriverContext * data)
do { \ do { \
data->func = SDL_GL_GetProcAddress(#func); \ data->func = SDL_GL_GetProcAddress(#func); \
if ( ! data->func ) { \ if ( ! data->func ) { \
return SDL_SetError("Couldn't load GLES2 function %s: %s\n", #func, SDL_GetError()); \ return SDL_SetError("Couldn't load GLES2 function %s: %s", #func, SDL_GetError()); \
} \ } \
} while ( 0 ); } while ( 0 );
#endif /* __SDL_NOGETPROCADDR__ */ #endif /* __SDL_NOGETPROCADDR__ */

2
src/video/SDL_stretch.c
View File

@ -102,7 +102,7 @@ generate_rowbytes(int src_w, int dst_w, int bpp)
store = STORE_WORD; store = STORE_WORD;
break; break;
default: default:
return SDL_SetError("ASM stretch of %d bytes isn't supported\n", bpp); return SDL_SetError("ASM stretch of %d bytes isn't supported", bpp);
} }
#ifdef HAVE_MPROTECT #ifdef HAVE_MPROTECT
/* Make the code writeable */ /* Make the code writeable */

2
src/video/android/SDL_androidwindow.c
View File

@ -128,7 +128,7 @@ Android_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
info->info.android.surface = data->egl_surface; info->info.android.surface = data->egl_surface;
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/cocoa/SDL_cocoawindow.m
View File

@ -1706,7 +1706,7 @@ Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
info->info.cocoa.window = nswindow; info->info.cocoa.window = nswindow;
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/directfb/SDL_DirectFB_render.c
View File

@ -530,7 +530,7 @@ DirectFB_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
/* find the right pixelformat */ /* find the right pixelformat */
pixelformat = DirectFB_SDLToDFBPixelFormat(texture->format); pixelformat = DirectFB_SDLToDFBPixelFormat(texture->format);
if (pixelformat == DSPF_UNKNOWN) { if (pixelformat == DSPF_UNKNOWN) {
SDL_SetError("Unknown pixel format %d\n", data->format); SDL_SetError("Unknown pixel format %d", data->format);
goto error; goto error;
} }

2
src/video/directfb/SDL_DirectFB_window.c
View File

@ -469,7 +469,7 @@ DirectFB_GetWindowWMInfo(_THIS, SDL_Window * window,
info->info.dfb.surface = windata->surface; info->info.dfb.surface = windata->surface;
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/haiku/SDL_bframebuffer.cc
View File

@ -77,7 +77,7 @@ int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
if(bitmap->InitCheck() != B_OK) { if(bitmap->InitCheck() != B_OK) {
delete bitmap; delete bitmap;
return SDL_SetError("Could not initialize back buffer!\n"); return SDL_SetError("Could not initialize back buffer!");
} }

2
src/video/haiku/SDL_bmodes.cc
View File

@ -310,7 +310,7 @@ int BE_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode){
} }
if(bscreen.SetMode(bmode) != B_OK) { if(bscreen.SetMode(bmode) != B_OK) {
return SDL_SetError("Bad video mode\n"); return SDL_SetError("Bad video mode");
} }
free(bmode_list); free(bmode_list);

4
src/video/pandora/SDL_pandora.c
View File

@ -304,7 +304,7 @@ PND_getwindowwminfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
if (info->version.major <= SDL_MAJOR_VERSION) { if (info->version.major <= SDL_MAJOR_VERSION) {
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("application not compiled with SDL %d.%d\n", SDL_SetError("application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }
@ -637,7 +637,7 @@ PND_gl_createcontext(_THIS, SDL_Window * window)
if (wdata->gles_surface == 0) { if (wdata->gles_surface == 0) {
SDL_SetError("Error : eglCreateWindowSurface failed;\n"); SDL_SetError("Error : eglCreateWindowSurface failed;");
return NULL; return NULL;
} }

4
src/video/psp/SDL_pspevents.c
View File

@ -260,12 +260,12 @@ void PSP_EventInit(_THIS)
#endif #endif
/* Start thread to read data */ /* Start thread to read data */
if((event_sem = SDL_CreateSemaphore(1)) == NULL) { if((event_sem = SDL_CreateSemaphore(1)) == NULL) {
SDL_SetError("Can't create input semaphore\n"); SDL_SetError("Can't create input semaphore");
return; return;
} }
running = 1; running = 1;
if((thread = SDL_CreateThreadInternal(EventUpdate, "PSPInputThread", 4096, NULL)) == NULL) { if((thread = SDL_CreateThreadInternal(EventUpdate, "PSPInputThread", 4096, NULL)) == NULL) {
SDL_SetError("Can't create input thread\n"); SDL_SetError("Can't create input thread");
return; return;
} }
} }

2
src/video/psp/SDL_pspvideo.c
View File

@ -297,7 +297,7 @@ PSP_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
if (info->version.major <= SDL_MAJOR_VERSION) { if (info->version.major <= SDL_MAJOR_VERSION) {
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("application not compiled with SDL %d.%d\n", SDL_SetError("application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/raspberry/SDL_rpivideo.c
View File

@ -373,7 +373,7 @@ RPI_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
if (info->version.major <= SDL_MAJOR_VERSION) { if (info->version.major <= SDL_MAJOR_VERSION) {
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("application not compiled with SDL %d.%d\n", SDL_SetError("application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/uikit/SDL_uikitwindow.m
View File

@ -360,7 +360,7 @@ UIKit_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/vivante/SDL_vivantevideo.c
View File

@ -376,7 +376,7 @@ VIVANTE_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
info->info.vivante.window = data->native_window; info->info.vivante.window = data->native_window;
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/windows/SDL_windowswindow.c
View File

@ -713,7 +713,7 @@ WIN_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/winrt/SDL_winrtvideo.cpp
View File

@ -771,7 +771,7 @@ WINRT_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
info->info.winrt.window = reinterpret_cast<IInspectable *>(data->coreWindow.Get()); info->info.winrt.window = reinterpret_cast<IInspectable *>(data->coreWindow.Get());
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
src/video/x11/SDL_x11opengl.c
View File

@ -566,7 +566,7 @@ X11_GL_ErrorHandler(Display * d, XErrorEvent * e)
} }
else else
{ {
SDL_SetError("Could not %s: %i (Base %i)\n", errorHandlerOperation, errorCode, errorBase); SDL_SetError("Could not %s: %i (Base %i)", errorHandlerOperation, errorCode, errorBase);
} }
return (0); return (0);

2
src/video/x11/SDL_x11window.c
View File

@ -1576,7 +1576,7 @@ X11_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
info->info.x11.window = data->xwindow; info->info.x11.window = data->xwindow;
return SDL_TRUE; return SDL_TRUE;
} else { } else {
SDL_SetError("Application not compiled with SDL %d.%d\n", SDL_SetError("Application not compiled with SDL %d.%d",
SDL_MAJOR_VERSION, SDL_MINOR_VERSION); SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
return SDL_FALSE; return SDL_FALSE;
} }

2
test/testgl2.c
View File

@ -56,7 +56,7 @@ static int LoadContext(GL_Context * data)
do { \ do { \
data->func = SDL_GL_GetProcAddress(#func); \ data->func = SDL_GL_GetProcAddress(#func); \
if ( ! data->func ) { \ if ( ! data->func ) { \
return SDL_SetError("Couldn't load GL function %s: %s\n", #func, SDL_GetError()); \ return SDL_SetError("Couldn't load GL function %s: %s", #func, SDL_GetError()); \
} \ } \
} while ( 0 ); } while ( 0 );
#endif /* __SDL_NOGETPROCADDR__ */ #endif /* __SDL_NOGETPROCADDR__ */

2
test/testgles2.c
View File

@ -59,7 +59,7 @@ static int LoadContext(GLES2_Context * data)
do { \ do { \
data->func = SDL_GL_GetProcAddress(#func); \ data->func = SDL_GL_GetProcAddress(#func); \
if ( ! data->func ) { \ if ( ! data->func ) { \
return SDL_SetError("Couldn't load GLES2 function %s: %s\n", #func, SDL_GetError()); \ return SDL_SetError("Couldn't load GLES2 function %s: %s", #func, SDL_GetError()); \
} \ } \
} while ( 0 ); } while ( 0 );
#endif /* __SDL_NOGETPROCADDR__ */ #endif /* __SDL_NOGETPROCADDR__ */