base64: code style fixups

diff --git a/src/detect-parse.c b/src/detect-parse.c
index d0f46714ec66e3b768afc17b4fb8cc5fd8cfcc78..f91e759171b6e9e47bcb7002e7040541b9772ad9 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -1320,8 +1320,9 @@ int SigValidate(DetectEngineCtx *de_ctx, Signature *s)
     }
 
     if (s->sm_lists[DETECT_SM_LIST_BASE64_DATA] != NULL) {
+        int list;
         uint16_t idx = s->sm_lists[DETECT_SM_LIST_BASE64_DATA]->idx;
-        for (int list = 0; list < DETECT_SM_LIST_MAX; list++) {
+        for (list = 0; list < DETECT_SM_LIST_MAX; list++) {
             if (list != DETECT_SM_LIST_BASE64_DATA &&
                 s->sm_lists[list] != NULL) {
                 if (s->sm_lists[list]->idx > idx) {

diff --git a/src/util-base64.c b/src/util-base64.c
index 45fdc01ab4a042d62141cf30fe402b219260a96d..bea92d52bb4bed9eae19c56c003cd70fbe738be5 100644 (file)
--- a/src/util-base64.c
+++ b/src/util-base64.c
@@ -50,8 +50,8 @@ static const int b64table[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
  *
  * \return The decoded value (0 or above), or -1 if the parameter is invalid
  */
-static inline int GetBase64Value(uint8_t c) {
-
+static inline int GetBase64Value(uint8_t c)
+{
     int val = -1;
 
     /* Pull from conversion table */
@@ -70,8 +70,8 @@ static inline int GetBase64Value(uint8_t c) {
  *
  * \return none
  */
-static inline void DecodeBase64Block(uint8_t ascii[ASCII_BLOCK], uint8_t b64[B64_BLOCK]) {
-
+static inline void DecodeBase64Block(uint8_t ascii[ASCII_BLOCK], uint8_t b64[B64_BLOCK])
+{
     ascii[0] = (uint8_t) (b64[0] << 2) | (b64[1] >> 4);
     ascii[1] = (uint8_t) (b64[1] << 4) | (b64[2] >> 2);
     ascii[2] = (uint8_t) (b64[2] << 6) | (b64[3]);
@@ -89,8 +89,8 @@ static inline void DecodeBase64Block(uint8_t ascii[ASCII_BLOCK], uint8_t b64[B64
  * \return Number of bytes decoded, or 0 if no data is decoded or it fails
  */
 uint32_t DecodeBase64(uint8_t *dest, const uint8_t *src, uint32_t len,
-    int strict) {
-
+    int strict)
+{
     int val;
     uint32_t padding = 0, numDecoded = 0, bbidx = 0, valid = 1, i;
     uint8_t *dptr = dest;