[MPlayer-cvslog] CVS: main/libvo vo_dga.c, 1.74, 1.75 vo_dxr3.c, 1.126, 1.127 vo_gif89a.c, 1.16, 1.17 x11_common.c, 1.202, 1.203

[Dominik Mierzejewski CVS]

CVS change done by Dominik Mierzejewski CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv26918/libvo

Modified Files:
	vo_dga.c vo_dxr3.c vo_gif89a.c x11_common.c 
Log Message:
massive attack: mp_msg printf format fixes


Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- vo_dga.c	24 Aug 2005 00:46:04 -0000	1.74
+++ vo_dga.c	12 Jan 2006 20:04:35 -0000	1.75
@@ -811,7 +811,7 @@
     // do some more checkings here ...
 
     mp_msg(MSGT_VO, MSGL_V,
-           "vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %08x, bpp: %d\n",
+           "vo_dga: bytes/line: %d, screen res: %dx%d, depth: %d, base: %p, bpp: %d\n",
            vo_dga_width, vo_dga_vp_width, vo_dga_vp_height,
            HW_MODE.vdm_bytespp, vo_dga_base, HW_MODE.vdm_bitspp);
 
@@ -900,7 +900,7 @@
             for (i = 0; i < vo_modecount; i++)
             {
                 mp_msg(MSGT_VO, MSGL_V,
-                       "vo_dga: (%03d) depth=%d, bpp=%d, r=%08x, g=%08x, b=%08x, %d x %d\n",
+                       "vo_dga: (%03d) depth=%d, bpp=%d, r=%08lx, g=%08lx, b=%08lx, %d x %d\n",
                        i, vo_modelines[i].depth,
                        vo_modelines[i].bitsPerPixel,
                        vo_modelines[i].redMask, vo_modelines[i].greenMask,

Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- vo_dxr3.c	6 Nov 2005 21:15:53 -0000	1.126
+++ vo_dxr3.c	12 Jan 2006 20:04:35 -0000	1.127
@@ -657,7 +657,7 @@
 		
 		acq_color = ((key_color.red / 256) << 16) | ((key_color.green / 256) << 8) | key_color.blue;
 		if (key_color.pixel != KEY_COLOR) {
-			printf("VO: [dxr3] Unable to allocate exact keycolor, using closest match (%0x).\n", key_color.pixel);	
+			printf("VO: [dxr3] Unable to allocate exact keycolor, using closest match (0x%lx).\n", key_color.pixel);	
 		}
 		
 		/* Set keycolor and activate overlay */

Index: vo_gif89a.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gif89a.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vo_gif89a.c	10 Oct 2005 12:59:36 -0000	1.16
+++ vo_gif89a.c	12 Jan 2006 20:04:35 -0000	1.17
@@ -165,7 +165,7 @@
 	char LB2[] = { 1, 0, 0 };
 #endif
 
-	mp_msg(MSGT_VO, MSGL_DBG2, "GIF89a: Config entered [%ldx%ld]\n", s_width,s_height);
+	mp_msg(MSGT_VO, MSGL_DBG2, "GIF89a: Config entered [%dx%d]\n", s_width,s_height);
 	mp_msg(MSGT_VO, MSGL_DBG2, "GIF89a: With requested format: %s\n", vo_format_name(format));
 	
 	// save these for later.

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- x11_common.c	7 Dec 2005 11:39:24 -0000	1.202
+++ x11_common.c	12 Jan 2006 20:04:35 -0000	1.203
@@ -205,7 +205,7 @@
     mp_msg(MSGT_VO, MSGL_ERR, "X11 error: %s\n", msg);
 
     mp_msg(MSGT_VO, MSGL_V,
-           "Type: %x, display: %x, resourceid: %x, serial: %x\n",
+           "Type: %x, display: %p, resourceid: %lx, serial: %lx\n",
            event->type, event->display, event->resourceid, event->serial);
     mp_msg(MSGT_VO, MSGL_V,
            "Error code: %x, request code: %x, minor code: %x\n",
@@ -1299,7 +1299,7 @@
         xev.data.l[0] = layer ? fs_layer : orig_layer;  // if not fullscreen, stay on default layer
         xev.data.l[1] = CurrentTime;
         mp_msg(MSGT_VO, MSGL_V,
-               "[x11] Layered style stay on top (layer %d).\n",
+               "[x11] Layered style stay on top (layer %ld).\n",
                xev.data.l[0]);
         XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask,
                    (XEvent *) & xev);
@@ -1604,7 +1604,7 @@
         return;
     }
     mp_msg(MSGT_VO, MSGL_INFO,
-           "xscreensaver_disable: xscreensaver wid=%d.\n", xs_windowid);
+           "xscreensaver_disable: xscreensaver wid=%ld.\n", xs_windowid);
 
     deactivate = XInternAtom(dpy, "DEACTIVATE", False);
     screensaver = XInternAtom(dpy, "SCREENSAVER", False);
@@ -1903,7 +1903,7 @@
         for (i = 0; i < nvisuals; i++)
         {
             mp_msg(MSGT_VO, MSGL_V,
-                   "vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
+                   "vo: X11 truecolor visual %#lx, depth %d, R:%lX G:%lX B:%lX\n",
                    visuals[i].visualid, visuals[i].depth,
                    visuals[i].red_mask, visuals[i].green_mask,
                    visuals[i].blue_mask);
@@ -2347,27 +2347,27 @@
   switch ( xv_ck_info.source )
   {
     case CK_SRC_CUR:      
-      mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06x).\n",
+      mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06lx).\n",
               xv_colorkey );
       break;
     case CK_SRC_USE:
       if ( xv_ck_info.method == CK_METHOD_AUTOPAINT )
       {
         mp_msg( MSGT_VO, MSGL_V,
-                "Ignoring colorkey from MPlayer (0x%06x).\n",
+                "Ignoring colorkey from MPlayer (0x%06lx).\n",
                 xv_colorkey );
       }
       else
       {
         mp_msg( MSGT_VO, MSGL_V,
-                "Using colorkey from MPlayer (0x%06x)."
+                "Using colorkey from MPlayer (0x%06lx)."
                 " Use -colorkey to change.\n",
                 xv_colorkey );
       }
       break;
     case CK_SRC_SET:
       mp_msg( MSGT_VO, MSGL_V,
-              "Setting and using colorkey from MPlayer (0x%06x)."
+              "Setting and using colorkey from MPlayer (0x%06lx)."
               " Use -colorkey to change.\n",
               xv_colorkey );
       break;