From 2601de41209ebed1abf2e577e109056fbe9d1211 Mon Sep 17 00:00:00 2001 From: rathann Date: Thu, 12 Jan 2006 20:04:36 +0000 Subject: massive attack: mp_msg printf format fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_dga.c | 4 ++-- libvo/vo_dxr3.c | 2 +- libvo/vo_gif89a.c | 2 +- libvo/x11_common.c | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index 4e28cb225a..9d0cf467c5 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -811,7 +811,7 @@ static int config(uint32_t width, uint32_t height, // 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 @@ static int preinit(const char *arg) 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, diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index eda1a3b4c2..b91c38c9d1 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -657,7 +657,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ 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 */ diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c index 1d5408d966..3155d5ee16 100644 --- a/libvo/vo_gif89a.c +++ b/libvo/vo_gif89a.c @@ -165,7 +165,7 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, 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. diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 44ca9216b6..97f3ba941f 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -205,7 +205,7 @@ static int x11_errorhandler(Display * display, XErrorEvent * event) 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 @@ void vo_x11_setlayer(Display * mDisplay, Window vo_window, int layer) 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 @@ static void xscreensaver_disable(Display * dpy) 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 @@ int vo_find_depth_from_visuals(Display * dpy, int screen, 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 @@ void vo_xv_print_ck_info() 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; -- cgit v1.2.3