Changeset 55808 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

May 11, 2015 6:31:56 PM (10 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: fix warnings.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_fb.c (modified) (2 diffs)
• vbox_main.c (modified) (1 diff)
• vbox_mode.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/vbox_fb.c

@@ -99 +99 @@
     struct drm_device *dev = afbdev->helper.dev;
     struct vbox_private *vbox = dev->dev_private;
-    struct drm_crtc *crtc;
     int i;
 
@@ -174 +173 @@
         /* assume equal stride for now */
         src_offset = dst_offset = i * afbdev->afb.base.pitches[0] + (x * bpp);
-        memcpy_toio(bo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x + 1) * bpp);
+        memcpy_toio(bo->kmap.virtual + src_offset, (char *)afbdev->sysram + src_offset, (x2 - x + 1) * bpp);
     }
     /* Not sure why the original code subtracted 1 here, but I will keep it that

trunk/src/VBox/Additions/linux/drm/vbox_main.c

@@ -363 +363 @@
 {
     struct vbox_private *vbox = dev->dev_private;
-    int i;
 
     LogFunc(("vboxvideo: %d\n", __LINE__));

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -485 +485 @@
     pDrmDev = pVBoxConnector->base.dev;
     pVBox = pDrmDev->dev_private;
-    if (sscanf(psz, "%dx%d\n%c", &cX, &cY, &ch) != 2)
+    if (sscanf(psz, "%5dx%5d\n%c", &cX, &cY, &ch) != 2)
         return -EINVAL;
     if (   cX < 64 || cX > VBE_DISPI_MAX_XRES