[vlc-devel] [PATCH] opengl: remove newline at the tail of log message

[Zhao Zhili]

---
 modules/video_output/opengl/converter_cvpx.c  |  6 +++---
 modules/video_output/opengl/converter_vdpau.c |  2 +-
 modules/video_output/opengl/vout_helper.c     | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/video_output/opengl/converter_cvpx.c b/modules/video_output/opengl/converter_cvpx.c
index 906533f..df93a90 100644
--- a/modules/video_output/opengl/converter_cvpx.c
+++ b/modules/video_output/opengl/converter_cvpx.c
@@ -123,7 +123,7 @@ tc_cvpx_update(const opengl_tex_converter_t *tc, GLuint *textures,
                                    surface, i);
         if (err != kCGLNoError)
         {
-            msg_Err(tc->gl, "CGLTexImageIOSurface2D error: %d: %s\n", i,
+            msg_Err(tc->gl, "CGLTexImageIOSurface2D error: %u: %s", i,
                     CGLErrorString(err));
             return VLC_EGENERIC;
         }
@@ -182,7 +182,7 @@ Open(vlc_object_t *obj)
         CVEAGLContext eagl_ctx = var_InheritAddress(tc->gl, "ios-eaglcontext");
         if (!eagl_ctx)
         {
-            msg_Err(tc->gl, "can't find ios-eaglcontext\n");
+            msg_Err(tc->gl, "can't find ios-eaglcontext");
             free(priv);
             return VLC_EGENERIC;
         }
@@ -202,7 +202,7 @@ Open(vlc_object_t *obj)
         priv->gl_ctx = var_InheritAddress(tc->gl, "macosx-glcontext");
         if (!priv->gl_ctx)
         {
-            msg_Err(tc->gl, "can't find macosx-glcontext\n");
+            msg_Err(tc->gl, "can't find macosx-glcontext");
             free(priv);
             return VLC_EGENERIC;
         }
diff --git a/modules/video_output/opengl/converter_vdpau.c b/modules/video_output/opengl/converter_vdpau.c
index 6b3467c..f3d807a 100644
--- a/modules/video_output/opengl/converter_vdpau.c
+++ b/modules/video_output/opengl/converter_vdpau.c
@@ -42,7 +42,7 @@
         GLenum ret = tc->vt->GetError(); \
         if (ret != GL_NO_ERROR) \
         { \
-            msg_Err(tc->gl, #fct " failed: 0x%x\n", ret); \
+            msg_Err(tc->gl, #fct " failed: 0x%x", ret); \
             return VLC_EGENERIC; \
         } \
     }
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 2bf4f81..9cbb6d3 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -469,7 +469,7 @@ opengl_link_program(struct prgm *prgm)
             int charsWritten;
             tc->vt->GetShaderInfoLog(shaders[i], infoLength, &charsWritten,
                                       infolog);
-            msg_Err(tc->gl, "shader %d: %s", i, infolog);
+            msg_Err(tc->gl, "shader %u: %s", i, infolog);
             free(infolog);
         }
     }
@@ -512,7 +512,7 @@ opengl_link_program(struct prgm *prgm)
     x = tc->vt->Get##type##Location(prgm->id, str); \
     assert(x != -1); \
     if (x == -1) { \
-        msg_Err(tc->gl, "Unable to Get"#type"Location(%s)\n", str); \
+        msg_Err(tc->gl, "Unable to Get"#type"Location(%s)", str); \
         goto error; \
     } \
 } while (0)
@@ -727,7 +727,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
                                                const vlc_viewpoint_t *viewpoint)
 {
     if (gl->getProcAddress == NULL) {
-        msg_Err(gl, "getProcAddress not implemented, bailing out\n");
+        msg_Err(gl, "getProcAddress not implemented, bailing out");
         return NULL;
     }
 
@@ -745,7 +745,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
 #define GET_PROC_ADDR_EXT(name, critical) do { \
     vgl->vt.name = vlc_gl_GetProcAddress(gl, "gl"#name); \
     if (vgl->vt.name == NULL && critical) { \
-        msg_Err(gl, "gl"#name" symbol not found, bailing out\n"); \
+        msg_Err(gl, "gl"#name" symbol not found, bailing out"); \
         free(vgl); \
         return NULL; \
     } \
@@ -840,7 +840,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     assert(extensions);
     if (!extensions)
     {
-        msg_Err(gl, "glGetString returned NULL\n");
+        msg_Err(gl, "glGetString returned NULL");
         free(vgl);
         return NULL;
     }
@@ -849,7 +849,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     bool supports_shaders = strverscmp((const char *)ogl_version, "2.0") >= 0;
     if (!supports_shaders)
     {
-        msg_Err(gl, "shaders not supported, bailing out\n");
+        msg_Err(gl, "shaders not supported, bailing out");
         free(vgl);
         return NULL;
     }
-- 
2.9.5