Make it compile again with "-Wall -pedantic -Werror", redoing quite a

[freeglut] / src / freeglut_cursor.c

diff --git a/src/freeglut_cursor.c b/src/freeglut_cursor.c
index 78841be..d26b581 100644 (file)
--- a/src/freeglut_cursor.c
+++ b/src/freeglut_cursor.c
@@ -49,7 +49,7 @@
 
 #if TARGET_HOST_UNIX_X11
 
-int fgGetCursorError( Cursor cursor )
+static int fghGetCursorError( Cursor cursor )
 {
     int ret = 0;
     char buf[ 256 ];
@@ -83,14 +83,14 @@ int fgGetCursorError( Cursor cursor )
  */
 void FGAPIENTRY glutSetCursor( int cursorID )
 {
-    freeglut_assert_ready;  /* XXX WHY do we need the timer active for this? */
-    freeglut_assert_window;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetCursor" );
+    FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" );
 
 #if TARGET_HOST_UNIX_X11
     /*
      * Open issues:
      * (a) Partial error checking.  Is that a problem?
-     *     Is fgGetCursorError() correct?  Should we abort on errors?
+     *     Is fghGetCursorError() correct?  Should we abort on errors?
      *     Should there be a freeglut-wide X error handler?  Should
      *     we use the X error-handler mechanism?
      * (b) FULL_CROSSHAIR demotes to plain CROSSHAIR.  Old GLUT allows
@@ -144,7 +144,7 @@ void FGAPIENTRY glutSetCursor( int cursorID )
              * need to pick a color for foreground/background---but what
              * one we pick doesn't matter for GLUT_CURSOR_NONE.
              */
-            static unsigned char no_cursor_bits[ 32 ];
+            static char no_cursor_bits[ 32 ];
             XColor black;
             no_cursor = XCreatePixmapFromBitmapData( fgDisplay.Display,
                                                      fgDisplay.RootWindow,
@@ -167,11 +167,11 @@ void FGAPIENTRY glutSetCursor( int cursorID )
             break;
 
         default:
-            fgWarning( "Unknown cursor type: %d\n", cursorID );
+            fgWarning( "Unknown cursor type: %d", cursorID );
             return;
         }
 
-        error = fgGetCursorError( cursor );
+        error = fghGetCursorError( cursor );
 
         if( GLUT_CURSOR_INHERIT == cursorID )
             XUndefineCursor( fgDisplay.Display,
@@ -236,8 +236,8 @@ void FGAPIENTRY glutSetCursor( int cursorID )
  */
 void FGAPIENTRY glutWarpPointer( int x, int y )
 {
-    freeglut_assert_ready; /* XXX WHY do we need the timer active for this? */
-    freeglut_assert_window;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );
+    FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
 
 #if TARGET_HOST_UNIX_X11
 
@@ -257,9 +257,7 @@ void FGAPIENTRY glutWarpPointer( int x, int y )
         coords.x = x;
         coords.y = y;
 
-        /*
-         * ClientToScreen() translates {coords} for us.
-         */
+        /* ClientToScreen() translates {coords} for us. */
         ClientToScreen( fgStructure.Window->Window.Handle, &coords );
         SetCursorPos( coords.x, coords.y );
     }