Changeset 26291 in vbox for trunk/src/VBox

Timestamp:

Feb 5, 2010 2:27:55 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57360

Message:

warnings.

Location:

trunk/src/VBox

Files:

• Devices/Storage/ISCSIHDDCore.cpp (modified) (1 diff)
• Devices/Storage/ParallelsHDDCore.cpp (modified) (1 diff)
• Devices/Storage/RawHDDCore.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/X11/Makefile.kup (added)
• Frontends/VirtualBox/src/X11/keyboard-new.c (modified) (6 diffs)
• Frontends/VirtualBox/src/X11/keyboard-types.h (modified) (3 diffs)
• Frontends/VirtualBox/src/X11/keyboard.h (modified) (1 diff)
• HostServices/SharedFolders/shflhandle.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp

@@ -3794 +3794 @@
     iscsiComposeLocation,
     /* pfnComposeName */
-    iscsiComposeName
+    iscsiComposeName,
+    /* pfnCompact */
+    NULL
 };

trunk/src/VBox/Devices/Storage/ParallelsHDDCore.cpp

@@ -1292 +1292 @@
     genericFileComposeLocation,
     /* pfnComposeName */
-    genericFileComposeName
+    genericFileComposeName,
+    /* pfnCompact */
+    NULL
 };
 

trunk/src/VBox/Devices/Storage/RawHDDCore.cpp

@@ -1321 +1321 @@
     genericFileComposeLocation,
     /* pfnComposeName */
-    genericFileComposeName
+    genericFileComposeName,
+    /* pfnCompact */
+    NULL
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/X11/keyboard-new.c

@@ -57 +57 @@
 #define KEYC2SCAN_SIZE 256
 
-/** 
+/**
  * Array containing the current mapping of keycodes to scan codes, detected
  * using the keyboard layout algorithm in X11DRV_InitKeyboardByLayout.
@@ -270 +270 @@
  * which one the X11 keycodes would be most sequential and hope that they
  * really are layed out more or less sequentially.
- * 
+ *
  * The actual detection of the current layout is done in the sub-function
- * X11DRV_KEYBOARD_DetectLayout.  Once we have determined the layout, since we 
+ * X11DRV_KEYBOARD_DetectLayout.  Once we have determined the layout, since we
  * know which PC scan code corresponds to each key in the layout, we can use
  * this information to associate the scan code with an X11 keycode, which is
@@ -404 +404 @@
 {
     unsigned i = 0, found = 0;
-    
-    keyboard_type hostKB = { 0 };
+
+    keyboard_type hostKB;
+    memset(&hostKB, '\0', sizeof(hostKB));
     hostKB.lctrl    = XKeysymToKeycode(display, XK_Control_L);
     hostKB.capslock = XKeysymToKeycode(display, XK_Caps_Lock);
@@ -464 +465 @@
  * the X11 keycodes will be mapped to the scan codes which the equivalent keys
  * on a PC keyboard would use.
- * 
+ *
  * We use two algorithms to try to determine the mapping.  See the comments
  * attached to the two algorithm functions (X11DRV_InitKeyboardByLayout and
@@ -487 +488 @@
 unsigned X11DRV_InitKeyboard(Display *display, unsigned *byLayoutOK, unsigned *byTypeOK, int (*remapScancodes)[2])
 {
-    unsigned byLayout; 
-    unsigned byType; 
+    unsigned byLayout;
+    unsigned byType;
 
     byLayout = X11DRV_InitKeyboardByLayout(display);
@@ -499 +500 @@
        identity mapping is seen */
     if(remapScancodes != NULL)
-        for(; (*remapScancodes)[0] != (*remapScancodes)[1]; remapScancodes++) 
+        for(; (*remapScancodes)[0] != (*remapScancodes)[1]; remapScancodes++)
             keyc2scan[(*remapScancodes)[0]] = (*remapScancodes)[1];
 

trunk/src/VBox/Frontends/VirtualBox/src/X11/keyboard-types.h

@@ -50 +50 @@
  * in this table (perhaps slightly too minimal...) because I wanted to be sure
  * that the keys chosen will be present on all keyboards, even very reduced
- * laptop keyboards. 
+ * laptop keyboards.
  */
 typedef struct {
@@ -79 +79 @@
     { "evdev", 0x25, 0x32, 0x42, 0x17, 0x9, 0x24, 0x6f, 0x74,
       0x71, 0x72, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a },
-    { NULL, 0 } /* Sentinal */
+    { NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Sentinal */
 };
 
@@ -111 +111 @@
       0x110, 0x117, 0x175, 0x0, 0x0, 0x0, 0x15f, 0x163, 0x0, 0x119, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
       0x120, 0x0, 0x122, 0x16c, 0x124, 0x15f, 0x16a, 0x169, 0x0, 0x0, 0x0, 0x119, 0x122, 0x110, 0x12e, 0x0,
-      0x130, 0x0, 0x0, 0x0, 0x132, 0x167, 0x140, 0x0, 0x0, 0x10b, 0x18b, 0x0, 0x0, 0x0, 0x105, 0x0, 
-      0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x138, 0x0, 0x0, 0x0, 0x0, 
-      0x122, 0x122, 0x0, 0x0, 0x0, 0x0, 0x140, 0x122, 0x169, 0x0, 0x137, 0x0, 0x0, 0x0, 0x0, 0x0, 
-      0x0, 0x165, 0x0, 0x0, 0x0, 0x165, 0x166, 0x167, 0x168, 0x169, 0x16a, 0x16b, 0x16c, 0x16d, 0x0, 0x143, 
+      0x130, 0x0, 0x0, 0x0, 0x132, 0x167, 0x140, 0x0, 0x0, 0x10b, 0x18b, 0x0, 0x0, 0x0, 0x105, 0x0,
+      0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x138, 0x0, 0x0, 0x0, 0x0,
+      0x122, 0x122, 0x0, 0x0, 0x0, 0x0, 0x140, 0x122, 0x169, 0x0, 0x137, 0x0, 0x0, 0x0, 0x0, 0x0,
+      0x0, 0x165, 0x0, 0x0, 0x0, 0x165, 0x166, 0x167, 0x168, 0x169, 0x16a, 0x16b, 0x16c, 0x16d, 0x0, 0x143,
       0x141, 0x0, 0x157, 0x105, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
     },

trunk/src/VBox/Frontends/VirtualBox/src/X11/keyboard.h

@@ -48 +48 @@
 extern CCALL __attribute__((visibility("default"))) unsigned X11DRV_KeyEvent(Display *dpy, KeyCode code);
 #else
-extern CCALL unsigned *X11DRV_getKeyc2scan();
+extern CCALL unsigned *X11DRV_getKeyc2scan(void);
 extern CCALL unsigned X11DRV_InitKeyboard(Display *dpy, unsigned *byLayoutOK, unsigned *byTypeOK, int (*remapScancodes)[2]);
 extern CCALL unsigned X11DRV_KeyEvent(Display *dpy, KeyCode code);

trunk/src/VBox/HostServices/SharedFolders/shflhandle.cpp

@@ -40 +40 @@
 static SHFLINTHANDLE *pHandles = NULL;
 static int32_t        lastHandleIndex = 0;
-static RTCRITSECT     lock = {0};
+static RTCRITSECT     lock;
 
 int vbsfInitHandleTable()