Reverted Bob's indent checkin

libsdl-org · Jan 10, 2009 · 8588699 · 8588699
1 parent 292229f
commit 8588699
Show file tree

Hide file tree

Showing 33 changed files with 501 additions and 659 deletions.
diff --git a/include/SDL_endian.h b/include/SDL_endian.h
@@ -156,8 +156,8 @@ SDL_Swap64(Uint64 x)
     } v;
     v.u = x;
   __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
-            "1"(v.
-                s.b));
+            "1"(v.s.
+                b));
     return v.u;
 }
 #elif defined(__GNUC__) && defined(__x86_64__)

diff --git a/src/SDL_error.c b/src/SDL_error.c
@@ -180,8 +180,8 @@ SDL_GetErrorMsg(char *errstr, unsigned int maxlen)
                 case 's':
                     len =
                         SDL_snprintf(msg, maxlen, tmp,
-                                     SDL_LookupString(error->
-                                                      args[argi++].buf));
+                                     SDL_LookupString(error->args[argi++].
+                                                      buf));
                     msg += len;
                     maxlen -= len;
                     break;

diff --git a/src/audio/dart/SDL_dart.c b/src/audio/dart/SDL_dart.c
@@ -62,8 +62,8 @@ DARTEventFunc(ULONG ulStatus, PMCI_MIX_BUFFER pBuffer, ULONG ulFlags)
                 pBufDesc->iBufferUsage = BUFFER_EMPTY;
                 // And notify DART feeder thread that it will have to work a bit.
                 if (pSDLAudioDevice)
-                    DosPostEventSem(pSDLAudioDevice->hidden->
-                                    hevAudioBufferPlayed);
+                    DosPostEventSem(pSDLAudioDevice->
+                                    hidden->hevAudioBufferPlayed);
             }
         }
     }
@@ -312,10 +312,11 @@ DART_PlayDevice(_THIS)
         (pMixBufferDesc) _this->hidden->pMixBuffers[iFreeBuf].ulUserParm;
     pBufDesc->iBufferUsage = BUFFER_USED;
     // Send it to DART to be queued
-    _this->hidden->MixSetupParms.pmixWrite(_this->hidden->MixSetupParms.
-                                           ulMixHandle,
-                                           &(_this->hidden->
-                                             pMixBuffers[iFreeBuf]), 1);
+    _this->hidden->MixSetupParms.pmixWrite(_this->hidden->
+                                           MixSetupParms.ulMixHandle,
+                                           &(_this->
+                                             hidden->pMixBuffers[iFreeBuf]),
+                                           1);
 
     _this->hidden->iLastPlayedBuf = iFreeBuf;
     iFreeBuf = (iFreeBuf + 1) % _this->hidden->iCurrNumBufs;
@@ -333,8 +334,8 @@ DART_GetDeviceBuf(_THIS)
         if (_this->hidden) {
             iFreeBuf = _this->hidden->iNextFreeBuffer;
             pBufDesc =
-                (pMixBufferDesc) _this->hidden->pMixBuffers[iFreeBuf].
-                ulUserParm;
+                (pMixBufferDesc) _this->hidden->
+                pMixBuffers[iFreeBuf].ulUserParm;
 
             if (pBufDesc) {
                 if (pBufDesc->iBufferUsage == BUFFER_EMPTY) {

diff --git a/src/audio/windib/SDL_dibaudio.c b/src/audio/windib/SDL_dibaudio.c
@@ -107,8 +107,8 @@ WINWAVEOUT_WaitDevice(_THIS)
 Uint8 *
 WINWAVEOUT_GetDeviceBuf(_THIS)
 {
-    return (Uint8 *) (this->hidden->wavebuf[this->hidden->next_buffer].
-                      lpData);
+    return (Uint8 *) (this->hidden->
+                      wavebuf[this->hidden->next_buffer].lpData);
 }
 
 void

diff --git a/src/audio/windx5/SDL_dx5audio.c b/src/audio/windx5/SDL_dx5audio.c
@@ -278,8 +278,9 @@ DSOUND_GetDeviceBuf(_THIS)
         IDirectSoundBuffer_Restore(this->hidden->mixbuf);
         result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor,
                                          this->hidden->mixlen,
-                                         (LPVOID *) & this->hidden->
-                                         locked_buf, &rawlen, NULL, &junk, 0);
+                                         (LPVOID *) & this->
+                                         hidden->locked_buf, &rawlen, NULL,
+                                         &junk, 0);
     }
     if (result != DS_OK) {
         SetDSerror("DirectSound Lock", result);

diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c
@@ -199,17 +199,17 @@ SDL_SYS_HapticInit(void)
                                          CFSTR(kIOHIDPrimaryUsagePageKey));
                 if (refCF) {
                     if (!CFNumberGetValue(refCF, kCFNumberLongType,
-                                          &SDL_hapticlist
-                                          [numhaptics].usagePage))
+                                          &SDL_hapticlist[numhaptics].
+                                          usagePage))
                         SDL_SetError
                             ("Haptic: Recieving device's usage page.");
                     refCF =
                         CFDictionaryGetValue(hidProperties,
                                              CFSTR(kIOHIDPrimaryUsageKey));
                     if (refCF) {
                         if (!CFNumberGetValue(refCF, kCFNumberLongType,
-                                              &SDL_hapticlist
-                                              [numhaptics].usage))
+                                              &SDL_hapticlist[numhaptics].
+                                              usage))
                             SDL_SetError("Haptic: Recieving device's usage.");
                     }
                 }

diff --git a/src/haptic/nds/SDL_syshaptic.c b/src/haptic/nds/SDL_syshaptic.c
@@ -96,7 +96,6 @@ NDS_EZF_ChipReset()
     }
     return 0;
 }
-
 void
 NDS_EZF_SetShake(u8 pos) 
 {

diff --git a/src/haptic/win32/SDL_syshaptic.c b/src/haptic/win32/SDL_syshaptic.c
@@ -212,8 +212,8 @@ EnumHapticsCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
     /* Get capabilities. */
     SDL_hapticlist[SDL_numhaptics].capabilities.dwSize = sizeof(DIDEVCAPS);
     ret = IDirectInputDevice_GetCapabilities(device,
-                                             &SDL_hapticlist
-                                             [SDL_numhaptics].capabilities);
+                                             &SDL_hapticlist[SDL_numhaptics].
+                                             capabilities);
     if (FAILED(ret)) {
         /* DI_SetError("Getting device capabilities",ret); */
         IDirectInputDevice_Release(device);
@@ -332,8 +332,8 @@ SDL_SYS_HapticOpenFromInstance(SDL_Haptic * haptic, DIDEVICEINSTANCE instance)
     /* Now get the IDirectInputDevice2 interface, instead. */
     ret = IDirectInputDevice_QueryInterface(device,
                                             &IID_IDirectInputDevice2,
-                                            (LPVOID *) & haptic->
-                                            hwdata->device);
+                                            (LPVOID *) & haptic->hwdata->
+                                            device);
     /* Done with the temporary one now. */
     IDirectInputDevice_Release(device);
     if (FAILED(ret)) {
@@ -500,8 +500,8 @@ int
 SDL_SYS_HapticOpen(SDL_Haptic * haptic)
 {
     return SDL_SYS_HapticOpenFromInstance(haptic,
-                                          SDL_hapticlist[haptic->
-                                                         index].instance);
+                                          SDL_hapticlist[haptic->index].
+                                          instance);
 }
 
 

diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
@@ -960,8 +960,8 @@ HandleHat(SDL_Joystick * stick, Uint8 hat, int axis, int value)
 #endif /* USE_LOGICAL_JOYSTICKS */
 
         SDL_PrivateJoystickHat(stick, hat,
-                               position_map[the_hat->axis[1]][the_hat->
-                                                              axis[0]]);
+                               position_map[the_hat->
+                                            axis[1]][the_hat->axis[0]]);
     }
 }
 
@@ -1092,13 +1092,13 @@ EV_HandleEvents(SDL_Joystick * joystick)
                     code -= BTN_MISC;
 #ifndef NO_LOGICAL_JOYSTICKS
                     if (!LogicalJoystickButton(joystick,
-                                               joystick->hwdata->
-                                               key_map[code],
+                                               joystick->
+                                               hwdata->key_map[code],
                                                events[i].value))
 #endif
                         SDL_PrivateJoystickButton(joystick,
-                                                  joystick->hwdata->
-                                                  key_map[code],
+                                                  joystick->
+                                                  hwdata->key_map[code],
                                                   events[i].value);
                 }
                 break;
@@ -1124,8 +1124,8 @@ EV_HandleEvents(SDL_Joystick * joystick)
                                              events[i].value))
 #endif
                         SDL_PrivateJoystickAxis(joystick,
-                                                joystick->hwdata->
-                                                abs_map[code],
+                                                joystick->
+                                                hwdata->abs_map[code],
                                                 events[i].value);
                     break;
                 }