--- a/src/joystick/macos/SDL_sysjoystick.c	Mon May 29 03:53:21 2006 +0000
+++ b/src/joystick/macos/SDL_sysjoystick.c	Mon May 29 04:04:35 2006 +0000
@@ -64,7 +64,7 @@
  * on an unrecoverable fatal error.
  */
 int
-SDL_SYS_JoystickInit (void)
+SDL_SYS_JoystickInit(void)
 {
     static ISpDeviceClass classes[4] = {
         kISpDeviceClass_Joystick,
@@ -79,61 +79,59 @@
     UInt32 count, numJoysticks;
 
     if ((Ptr) 0 == (Ptr) ISpStartup) {
-        SDL_SetError ("InputSprocket not installed");
+        SDL_SetError("InputSprocket not installed");
         return -1;              //  InputSprocket not installed
     }
 
     if ((Ptr) 0 == (Ptr) ISpGetVersion) {
-        SDL_SetError ("InputSprocket not version 1.1 or newer");
+        SDL_SetError("InputSprocket not version 1.1 or newer");
         return -1;              //  old version of ISp (not at least 1.1)
     }
 
-    ISpStartup ();
+    ISpStartup();
 
     /* Get all the joysticks */
     numJoysticks = 0;
     for (i = 0; classes[i]; ++i) {
         count = 0;
-        err = ISpDevices_ExtractByClass (classes[i],
-                                         MAX_JOYSTICKS - numJoysticks,
-                                         &count,
-                                         &SYS_Joysticks[numJoysticks]);
+        err = ISpDevices_ExtractByClass(classes[i],
+                                        MAX_JOYSTICKS - numJoysticks,
+                                        &count, &SYS_Joysticks[numJoysticks]);
         numJoysticks += count;
     }
 
     for (i = 0; i < numJoysticks; i++) {
-        ISpDevice_GetDefinition (SYS_Joysticks[i],
-                                 sizeof (ISpDeviceDefinition),
-                                 &SYS_DevDef[i]);
+        ISpDevice_GetDefinition(SYS_Joysticks[i],
+                                sizeof(ISpDeviceDefinition), &SYS_DevDef[i]);
 
-        err = ISpElementList_New (0, NULL, &SYS_Elements[i], 0);
+        err = ISpElementList_New(0, NULL, &SYS_Elements[i], 0);
 
         if (err) {
-            SDL_OutOfMemory ();
+            SDL_OutOfMemory();
             return -1;
         }
 
-        ISpDevice_GetElementList (SYS_Joysticks[i], &SYS_Elements[i]);
+        ISpDevice_GetElementList(SYS_Joysticks[i], &SYS_Elements[i]);
     }
 
-    ISpDevices_Deactivate (numJoysticks, SYS_Joysticks);
+    ISpDevices_Deactivate(numJoysticks, SYS_Joysticks);
 
     return numJoysticks;
 }
 
 /* Function to get the device-dependent name of a joystick */
 const char *
-SDL_SYS_JoystickName (int index)
+SDL_SYS_JoystickName(int index)
 {
     static char name[64];
     int len;
 
     /*  convert pascal string to c-string  */
     len = SYS_DevDef[index].deviceName[0];
-    if (len >= sizeof (name)) {
-        len = (sizeof (name) - 1);
+    if (len >= sizeof(name)) {
+        len = (sizeof(name) - 1);
     }
-    SDL_memcpy (name, &SYS_DevDef[index].deviceName[1], len);
+    SDL_memcpy(name, &SYS_DevDef[index].deviceName[1], len);
     name[len] = '\0';
 
     return name;
@@ -145,7 +143,7 @@
    It returns 0, or -1 if there is an error.
  */
 int
-SDL_SYS_JoystickOpen (SDL_Joystick * joystick)
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick)
 {
     int index;
     UInt32 count, gotCount, count2;
@@ -159,39 +157,39 @@
 
     /* allocate memory for system specific hardware data */
     joystick->hwdata =
-        (struct joystick_hwdata *) SDL_malloc (sizeof (*joystick->hwdata));
+        (struct joystick_hwdata *) SDL_malloc(sizeof(*joystick->hwdata));
     if (joystick->hwdata == NULL) {
-        SDL_OutOfMemory ();
+        SDL_OutOfMemory();
         return (-1);
     }
-    SDL_memset (joystick->hwdata, 0, sizeof (*joystick->hwdata));
-    SDL_strlcpy (joystick->hwdata->name, SDL_SYS_JoystickName (index),
-                 SDL_arraysize (joystick->hwdata->name));
+    SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata));
+    SDL_strlcpy(joystick->hwdata->name, SDL_SYS_JoystickName(index),
+                SDL_arraysize(joystick->hwdata->name));
     joystick->name = joystick->hwdata->name;
 
-    ISpElementList_ExtractByKind (SYS_Elements[index],
-                                  kISpElementKind_Axis,
-                                  count, &gotCount, joystick->hwdata->refs);
+    ISpElementList_ExtractByKind(SYS_Elements[index],
+                                 kISpElementKind_Axis,
+                                 count, &gotCount, joystick->hwdata->refs);
 
     numAxis = gotCount;
     count -= gotCount;
     count2 += gotCount;
 
-    ISpElementList_ExtractByKind (SYS_Elements[index],
-                                  kISpElementKind_DPad,
-                                  count,
-                                  &gotCount,
-                                  &(joystick->hwdata->refs[count2]));
+    ISpElementList_ExtractByKind(SYS_Elements[index],
+                                 kISpElementKind_DPad,
+                                 count,
+                                 &gotCount,
+                                 &(joystick->hwdata->refs[count2]));
 
     numHats = gotCount;
     count -= gotCount;
     count2 += gotCount;
 
-    ISpElementList_ExtractByKind (SYS_Elements[index],
-                                  kISpElementKind_Button,
-                                  count,
-                                  &gotCount,
-                                  &(joystick->hwdata->refs[count2]));
+    ISpElementList_ExtractByKind(SYS_Elements[index],
+                                 kISpElementKind_Button,
+                                 count,
+                                 &gotCount,
+                                 &(joystick->hwdata->refs[count2]));
 
     numButtons = gotCount;
     count -= gotCount;
@@ -202,7 +200,7 @@
     joystick->nballs = numBalls;
     joystick->nbuttons = numButtons;
 
-    ISpDevices_Activate (1, &SYS_Joysticks[index]);
+    ISpDevices_Activate(1, &SYS_Joysticks[index]);
 
     return 0;
 }
@@ -213,7 +211,7 @@
  * and update joystick device state.
  */
 void
-SDL_SYS_JoystickUpdate (SDL_Joystick * joystick)
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
 {
     int i, j;
     ISpAxisData a;
@@ -224,17 +222,17 @@
     for (i = 0, j = 0; i < joystick->naxes; i++, j++) {
         Sint16 value;
 
-        ISpElement_GetSimpleState (joystick->hwdata->refs[j], &a);
-        value = (ISpSymmetricAxisToFloat (a) * 32767.0);
+        ISpElement_GetSimpleState(joystick->hwdata->refs[j], &a);
+        value = (ISpSymmetricAxisToFloat(a) * 32767.0);
         if (value != joystick->axes[i]) {
-            SDL_PrivateJoystickAxis (joystick, i, value);
+            SDL_PrivateJoystickAxis(joystick, i, value);
         }
     }
 
     for (i = 0; i < joystick->nhats; i++, j++) {
         Uint8 pos;
 
-        ISpElement_GetSimpleState (joystick->hwdata->refs[j], &b);
+        ISpElement_GetSimpleState(joystick->hwdata->refs[j], &b);
         switch (b) {
         case kISpPadIdle:
             pos = SDL_HAT_CENTERED;
@@ -265,7 +263,7 @@
             break;
         }
         if (pos != joystick->hats[i]) {
-            SDL_PrivateJoystickHat (joystick, i, pos);
+            SDL_PrivateJoystickHat(joystick, i, pos);
         }
     }
 
@@ -274,29 +272,29 @@
     }
 
     for (i = 0; i < joystick->nbuttons; i++, j++) {
-        ISpElement_GetSimpleState (joystick->hwdata->refs[j], &d);
+        ISpElement_GetSimpleState(joystick->hwdata->refs[j], &d);
         if (d != joystick->buttons[i]) {
-            SDL_PrivateJoystickButton (joystick, i, d);
+            SDL_PrivateJoystickButton(joystick, i, d);
         }
     }
 }
 
 /* Function to close a joystick after use */
 void
-SDL_SYS_JoystickClose (SDL_Joystick * joystick)
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
 {
     int index;
 
     index = joystick->index;
 
-    ISpDevices_Deactivate (1, &SYS_Joysticks[index]);
+    ISpDevices_Deactivate(1, &SYS_Joysticks[index]);
 }
 
 /* Function to perform any system-specific joystick related cleanup */
 void
-SDL_SYS_JoystickQuit (void)
+SDL_SYS_JoystickQuit(void)
 {
-    ISpShutdown ();
+    ISpShutdown();
 }
 
 #endif /* SDL_JOYSTICK_MACOS */