[tor-commits] [tor/master] Clean up indentation in aes.c

[nickm at torproject.org]

commit cc5c14b7327924e7136f8709d69cf23761ab7a44
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 10 10:07:33 2012 -0500

    Clean up indentation in aes.c
---
 src/common/aes.c |   76 +++++++++++++++++++++++++++---------------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/common/aes.c b/src/common/aes.c
index f6288e8..3c315dc 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -324,28 +324,28 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len,
   else
 #endif
   {
-  int c = cipher->pos;
-  if (PREDICT_UNLIKELY(!len)) return;
-
-  while (1) {
-    do {
-      if (len-- == 0) { cipher->pos = c; return; }
-      *(output++) = *(input++) ^ cipher->buf[c];
-    } while (++c != 16);
-    cipher->pos = c = 0;
-    if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 0))) {
-      if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 1))) {
-        if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 2))) {
-          ++COUNTER(cipher, 3);
-          UPDATE_CTR_BUF(cipher, 3);
+    int c = cipher->pos;
+    if (PREDICT_UNLIKELY(!len)) return;
+
+    while (1) {
+      do {
+        if (len-- == 0) { cipher->pos = c; return; }
+        *(output++) = *(input++) ^ cipher->buf[c];
+      } while (++c != 16);
+      cipher->pos = c = 0;
+      if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 0))) {
+        if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 1))) {
+          if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 2))) {
+            ++COUNTER(cipher, 3);
+            UPDATE_CTR_BUF(cipher, 3);
+          }
+          UPDATE_CTR_BUF(cipher, 2);
         }
-        UPDATE_CTR_BUF(cipher, 2);
+        UPDATE_CTR_BUF(cipher, 1);
       }
-      UPDATE_CTR_BUF(cipher, 1);
+      UPDATE_CTR_BUF(cipher, 0);
+      _aes_fill_buf(cipher);
     }
-    UPDATE_CTR_BUF(cipher, 0);
-    _aes_fill_buf(cipher);
-  }
   }
 }
 
@@ -364,28 +364,28 @@ aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len)
   else
 #endif
   {
-  int c = cipher->pos;
-  if (PREDICT_UNLIKELY(!len)) return;
-
-  while (1) {
-    do {
-      if (len-- == 0) { cipher->pos = c; return; }
-      *(data++) ^= cipher->buf[c];
-    } while (++c != 16);
-    cipher->pos = c = 0;
-    if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 0))) {
-      if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 1))) {
-        if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 2))) {
-          ++COUNTER(cipher, 3);
-          UPDATE_CTR_BUF(cipher, 3);
+    int c = cipher->pos;
+    if (PREDICT_UNLIKELY(!len)) return;
+
+    while (1) {
+      do {
+        if (len-- == 0) { cipher->pos = c; return; }
+        *(data++) ^= cipher->buf[c];
+      } while (++c != 16);
+      cipher->pos = c = 0;
+      if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 0))) {
+        if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 1))) {
+          if (PREDICT_UNLIKELY(! ++COUNTER(cipher, 2))) {
+            ++COUNTER(cipher, 3);
+            UPDATE_CTR_BUF(cipher, 3);
+          }
+          UPDATE_CTR_BUF(cipher, 2);
         }
-        UPDATE_CTR_BUF(cipher, 2);
+        UPDATE_CTR_BUF(cipher, 1);
       }
-      UPDATE_CTR_BUF(cipher, 1);
+      UPDATE_CTR_BUF(cipher, 0);
+      _aes_fill_buf(cipher);
     }
-    UPDATE_CTR_BUF(cipher, 0);
-    _aes_fill_buf(cipher);
-  }
   }
 }