Run Lindent on libtom(*)

1 files changed, 49 insertions, 65 deletions

diff --git a/libtomcrypt/headers/tomcrypt_macros.h b/libtomcrypt/headers/tomcrypt_macros.h
index 53bda9b..027dac8 100644
--- a/libtomcrypt/headers/tomcrypt_macros.h
+++ b/libtomcrypt/headers/tomcrypt_macros.h
@@ -1,19 +1,19 @@
 /* fix for MSVC ...evil! */
 #ifdef _MSC_VER
-   #define CONST64(n) n ## ui64
-   typedef unsigned __int64 ulong64;
+#define CONST64(n) n ## ui64
+typedef unsigned __int64 ulong64;
 #else
-   #define CONST64(n) n ## ULL
-   typedef unsigned long long ulong64;
+#define CONST64(n) n ## ULL
+typedef unsigned long long ulong64;
 #endif
 
 /* this is the "32-bit at least" data type 
  * Re-define it to suit your platform but it must be at least 32-bits 
  */
 #if defined(__x86_64__) || (defined(__sparc__) && defined(__arch64__))
-   typedef unsigned ulong32;
+typedef unsigned ulong32;
 #else
-   typedef unsigned long ulong32;
+typedef unsigned long ulong32;
 #endif
 
 /* ---- HELPER MACROS ---- */
@@ -96,7 +96,6 @@ asm __volatile__ (             \
 
 #endif
 
-
 /* x86_64 processor */
 #if !defined(LTC_NO_BSWAP) && (defined(__GNUC__) && defined(__x86_64__))
 
@@ -129,7 +128,7 @@ asm __volatile__ (             \
 
 #endif
 
-#ifdef ENDIAN_32BITWORD 
+#ifdef ENDIAN_32BITWORD
 
 #define STORE32L(x, y)        \
      { ulong32  __t = (x); XMEMCPY(y, &__t, 4); }
@@ -190,7 +189,7 @@ asm __volatile__ (             \
          (((ulong64)((y)[3] & 255))<<24)|(((ulong64)((y)[2] & 255))<<16) | \
          (((ulong64)((y)[1] & 255))<<8)|(((ulong64)((y)[0] & 255))); }
 
-#ifdef ENDIAN_32BITWORD 
+#ifdef ENDIAN_32BITWORD
 
 #define STORE32H(x, y)        \
      { ulong32 __t = (x); XMEMCPY(y, &__t, 4); }
@@ -230,7 +229,6 @@ asm __volatile__ (             \
 #define BSWAP(x)  ( ((x>>24)&0x000000FFUL) | ((x<<24)&0xFF000000UL)  | \
                     ((x>>8)&0x0000FF00UL)  | ((x<<8)&0x00FF0000UL) )
 
-
 /* 32-bit Rotates */
 #if defined(_MSC_VER)
 
@@ -246,36 +244,32 @@ asm __volatile__ (             \
 
 static inline unsigned ROL(unsigned word, int i)
 {
-   asm ("roll %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
+asm("roll %%cl,%0":"=r"(word)
+:	    "0"(word), "c"(i));
+	return word;
 }
 
 static inline unsigned ROR(unsigned word, int i)
 {
-   asm ("rorl %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
+asm("rorl %%cl,%0":"=r"(word)
+:	    "0"(word), "c"(i));
+	return word;
 }
 
 #ifndef LTC_NO_ROLC
 
 static inline unsigned ROLc(unsigned word, const int i)
 {
-   asm ("roll %2,%0"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
+asm("roll %2,%0":"=r"(word)
+:	    "0"(word), "I"(i));
+	return word;
 }
 
 static inline unsigned RORc(unsigned word, const int i)
 {
-   asm ("rorl %2,%0"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
+asm("rorl %2,%0":"=r"(word)
+:	    "0"(word), "I"(i));
+	return word;
 }
 
 #else
@@ -289,36 +283,32 @@ static inline unsigned RORc(unsigned word, const int i)
 
 static inline unsigned ROL(unsigned word, int i)
 {
-   asm ("rotlw %0,%0,%2"
-      :"=r" (word)
-      :"0" (word),"r" (i));
-   return word;
+asm("rotlw %0,%0,%2":"=r"(word)
+:	    "0"(word), "r"(i));
+	return word;
 }
 
 static inline unsigned ROR(unsigned word, int i)
 {
-   asm ("rotlw %0,%0,%2"
-      :"=r" (word)
-      :"0" (word),"r" (32-i));
-   return word;
+asm("rotlw %0,%0,%2":"=r"(word)
+:	    "0"(word), "r"(32 - i));
+	return word;
 }
 
 #ifndef LTC_NO_ROLC
 
 static inline unsigned ROLc(unsigned word, const int i)
 {
-   asm ("rotlwi %0,%0,%2"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
+asm("rotlwi %0,%0,%2":"=r"(word)
+:	    "0"(word), "I"(i));
+	return word;
 }
 
 static inline unsigned RORc(unsigned word, const int i)
 {
-   asm ("rotrwi %0,%0,%2"
-      :"=r" (word)
-      :"0" (word),"I" (i));
-   return word;
+asm("rotrwi %0,%0,%2":"=r"(word)
+:	    "0"(word), "I"(i));
+	return word;
 }
 
 #else
@@ -328,7 +318,6 @@ static inline unsigned RORc(unsigned word, const int i)
 
 #endif
 
-
 #else
 
 /* rotates the hard way */
@@ -339,42 +328,37 @@ static inline unsigned RORc(unsigned word, const int i)
 
 #endif
 
-
 /* 64-bit Rotates */
 #if !defined(__STRICT_ANSI__) && defined(__GNUC__) && defined(__x86_64__) && !defined(LTC_NO_ASM)
 
 static inline unsigned long ROL64(unsigned long word, int i)
 {
-   asm("rolq %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
+asm("rolq %%cl,%0":"=r"(word)
+:	    "0"(word), "c"(i));
+	return word;
 }
 
 static inline unsigned long ROR64(unsigned long word, int i)
 {
-   asm("rorq %%cl,%0"
-      :"=r" (word)
-      :"0" (word),"c" (i));
-   return word;
+asm("rorq %%cl,%0":"=r"(word)
+:	    "0"(word), "c"(i));
+	return word;
 }
 
 #ifndef LTC_NO_ROLC
 
 static inline unsigned long ROL64c(unsigned long word, const int i)
 {
-   asm("rolq %2,%0"
-      :"=r" (word)
-      :"0" (word),"J" (i));
-   return word;
+asm("rolq %2,%0":"=r"(word)
+:	    "0"(word), "J"(i));
+	return word;
 }
 
 static inline unsigned long ROR64c(unsigned long word, const int i)
 {
-   asm("rorq %2,%0"
-      :"=r" (word)
-      :"0" (word),"J" (i));
-   return word;
+asm("rorq %2,%0":"=r"(word)
+:	    "0"(word), "J"(i));
+	return word;
 }
 
 #else /* LTC_NO_ROLC */
@@ -405,19 +389,19 @@ static inline unsigned long ROR64c(unsigned long word, const int i)
 #endif
 
 #ifndef MAX
-   #define MAX(x, y) ( ((x)>(y))?(x):(y) )
+#define MAX(x, y) ( ((x)>(y))?(x):(y) )
 #endif
 
 #ifndef MIN
-   #define MIN(x, y) ( ((x)<(y))?(x):(y) )
+#define MIN(x, y) ( ((x)<(y))?(x):(y) )
 #endif
 
 /* extract a byte portably */
 #ifdef _MSC_VER
-   #define byte(x, n) ((unsigned char)((x) >> (8 * (n))))
+#define byte(x, n) ((unsigned char)((x) >> (8 * (n))))
 #else
-   #define byte(x, n) (((x) >> (8 * (n))) & 255)
-#endif   
+#define byte(x, n) (((x) >> (8 * (n))) & 255)
+#endif
 
 /* $Source: /cvs/libtom/libtomcrypt/src/headers/tomcrypt_macros.h,v $ */
 /* $Revision: 1.15 $ */