Changeset 55391 in vbox

Timestamp:

Apr 22, 2015 7:36:49 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: cursor function naming.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• pointer.c (modified) (2 diffs)
• vboxvideo.c (modified) (2 diffs)
• vboxvideo.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/pointer.c

@@ -114 +114 @@
 **************************************************************************/
 
-void
-vbox_close(ScrnInfoPtr pScrn, VBOXPtr pVBox)
+void vbvxCursorTerm(VBOXPtr pVBox)
 {
     TRACE_ENTRY();
@@ -438 +437 @@
 #endif
 
-Bool
-vbox_cursor_init(ScreenPtr pScreen)
+Bool vbvxCursorInit(ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -1370 +1370 @@
         xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
 
-    if (vbox_cursor_init(pScreen) != TRUE)
+    if (vbvxCursorInit(pScreen) != TRUE)
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                    "Unable to start the VirtualBox mouse pointer integration with the host system.\n");
@@ -1484 +1484 @@
     pScrn->vtSema = FALSE;
 
-    /* Do additional bits which are separate for historical reasons */
-    vbox_close(pScrn, pVBox);
+    vbvxCursorTerm(pVBox);
 
     pScreen->CloseScreen = pVBox->CloseScreen;

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -270 +270 @@
 extern void vbvxSetSolarisMouseRange(int width, int height);
 
-extern Bool vbox_cursor_init (ScreenPtr pScreen);
-extern void vbox_close (ScrnInfoPtr pScrn, VBOXPtr pVBox);
+/* pointer.h */
+extern Bool vbvxCursorInit(ScreenPtr pScreen);
+extern void vbvxCursorTerm(VBOXPtr pVBox);
 
 /* vbva.c */