Put "{" at end of line with "if" to keep a consistent style

[skip ci]

(cherry picked from commit cc848f15355cbc346f9f73129ca689611ef5459b)

diff --git a/addrtostr.c b/addrtostr.c
index f898c04fb413a9a0e9a190c2323de7a9982c6e57..f1ccf797b04553fe4d53595ffabf2318552d2b53 100644 (file)
--- a/addrtostr.c
+++ b/addrtostr.c
@@ -128,14 +128,12 @@ addrtostr6 (const void *src, char *dst, size_t size)
   cur.len = 0;
   cur.base  = -1;
   for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
   cur.len = 0;
   cur.base  = -1;
   for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {

-    if (words[i] == 0)
-    {
+    if (words[i] == 0) {

       if (cur.base == -1)
            cur.base = i, cur.len = 1;
       else cur.len++;
     }
       if (cur.base == -1)
            cur.base = i, cur.len = 1;
       else cur.len++;
     }

-    else if (cur.base != -1)
-    {
+    else if (cur.base != -1) {

       if (best.base == -1 || cur.len > best.len)
          best = cur;
       cur.base = -1;
       if (best.base == -1 || cur.len > best.len)
          best = cur;
       cur.base = -1;


@@ -162,8 +160,7 @@ addrtostr6 (const void *src, char *dst, size_t size)
   for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
     /* Are we inside the best run of 0x00's?
      */
   for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
     /* Are we inside the best run of 0x00's?
      */

-    if (best.base != -1 && i >= best.base && i < (best.base + best.len))
-    {
+    if (best.base != -1 && i >= best.base && i < (best.base + best.len)) {

       if (i == best.base)
          APPEND_CHAR(':');
       continue;
       if (i == best.base)
          APPEND_CHAR(':');
       continue;


@@ -179,8 +176,7 @@ addrtostr6 (const void *src, char *dst, size_t size)
     if (i == 6 && best.base == 0 &&
         (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
     {
     if (i == 6 && best.base == 0 &&
         (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
     {

-      if (!addrtostr(srcaddr+12, dp, space_left))
-      {
+      if (!addrtostr(srcaddr+12, dp, space_left)) {

         errno = ENOSPC;
         return (NULL);
       }
         errno = ENOSPC;
         return (NULL);
       }


@@ -192,8 +188,7 @@ addrtostr6 (const void *src, char *dst, size_t size)
     snprintfed = snprintf (dp, space_left, "%x", words[i]);
     if (snprintfed < 0)
         return (NULL);
     snprintfed = snprintf (dp, space_left, "%x", words[i]);
     if (snprintfed < 0)
         return (NULL);

-    if ((size_t) snprintfed >= space_left)
-    {
+    if ((size_t) snprintfed >= space_left) {

         errno = ENOSPC;
         return (NULL);
     }
         errno = ENOSPC;
         return (NULL);
     }

diff --git a/print-bfd.c b/print-bfd.c
index 8c047357db3ed65ffc262ae2723c2e70be86a75c..a799529ec62f2be5420cfe1bbaa9f060cc6a35c0 100644 (file)
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -313,8 +313,7 @@ bfd_print(netdissect_options *ndo, const u_char *pptr,
 
                 /* BFDv0 */
             case 0:
 
                 /* BFDv0 */
             case 0:

-                if (ndo->ndo_vflag < 1)
-                {
+                if (ndo->ndo_vflag < 1) {

                     ND_PRINT("BFDv0, Control, Flags: [%s], length: %u",
                            bittok2str(bfd_v0_flag_values, "none", flags),
                            len);
                     ND_PRINT("BFDv0, Control, Flags: [%s], length: %u",
                            bittok2str(bfd_v0_flag_values, "none", flags),
                            len);


@@ -351,8 +350,7 @@ bfd_print(netdissect_options *ndo, const u_char *pptr,
 
                 /* BFDv1 */
             case 1:
 
                 /* BFDv1 */
             case 1:

-                if (ndo->ndo_vflag < 1)
-                {
+                if (ndo->ndo_vflag < 1) {

                     ND_PRINT("BFDv1, %s, State %s, Flags: [%s], length: %u",
                            tok2str(bfd_port_values, "unknown (%u)", port),
                            tok2str(bfd_v1_state_values, "unknown (%u)", (flags & 0xc0) >> 6),
                     ND_PRINT("BFDv1, %s, State %s, Flags: [%s], length: %u",
                            tok2str(bfd_port_values, "unknown (%u)", port),
                            tok2str(bfd_v1_state_values, "unknown (%u)", (flags & 0xc0) >> 6),

diff --git a/print-olsr.c b/print-olsr.c
index 8f049237167b98f2f1643d40011beea17823171f..0ab54f1e2b46044235037056ba883fde54fef642 100644 (file)
--- a/print-olsr.c
+++ b/print-olsr.c
@@ -361,8 +361,7 @@ olsr_print(netdissect_options *ndo,
         } msgptr;
         int msg_len_valid = 0;
 
         } msgptr;
         int msg_len_valid = 0;
 

-        if (is_ipv6)
-        {
+        if (is_ipv6) {

             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg6));
             msgptr.v6 = (const struct olsr_msg6 *) tptr;
             msg_type = GET_U_1(msgptr.v6->msg_type);
             ND_TCHECK_LEN(tptr, sizeof(struct olsr_msg6));
             msgptr.v6 = (const struct olsr_msg6 *) tptr;
             msg_type = GET_U_1(msgptr.v6->msg_type);


@@ -534,8 +533,7 @@ olsr_print(netdissect_options *ndo,
         }
 
         case OLSR_HNA_MSG:
         }
 
         case OLSR_HNA_MSG:

-            if (is_ipv6)
-            {
+            if (is_ipv6) {

                 int i = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",
                 int i = 0;
 
                 ND_PRINT("\n\t  Advertised networks (total %u)",

diff --git a/print-radius.c b/print-radius.c
index 414a15b5cbb56baac7ec252049534d10cfad631e..c22475db5653ecf2440ac19219ca4161cdf44daa 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -794,8 +794,7 @@ print_attr_string(netdissect_options *ndo,
       case TUNNEL_ASSIGN_ID:
       case TUNNEL_CLIENT_AUTH:
       case TUNNEL_SERVER_AUTH:
       case TUNNEL_ASSIGN_ID:
       case TUNNEL_CLIENT_AUTH:
       case TUNNEL_SERVER_AUTH:

-           if (GET_U_1(data) <= 0x1F)
-           {
+           if (GET_U_1(data) <= 0x1F) {

               if (length < 1)
                  goto trunc;
               if (GET_U_1(data))
               if (length < 1)
                  goto trunc;
               if (GET_U_1(data))


@@ -857,15 +856,13 @@ print_vendor_attr(netdissect_options *ndo,
         vendor_type = GET_U_1(data);
         vendor_length = GET_U_1(data + 1);
 
         vendor_type = GET_U_1(data);
         vendor_length = GET_U_1(data + 1);
 

-        if (vendor_length < 2)
-        {
+        if (vendor_length < 2) {

             ND_PRINT("\n\t    Vendor Attribute: %u, Length: %u (bogus, must be >= 2)",
                    vendor_type,
                    vendor_length);
             return;
         }
             ND_PRINT("\n\t    Vendor Attribute: %u, Length: %u (bogus, must be >= 2)",
                    vendor_type,
                    vendor_length);
             return;
         }

-        if (vendor_length > length)
-        {
+        if (vendor_length > length) {

             ND_PRINT("\n\t    Vendor Attribute: %u, Length: %u (bogus, goes past end of vendor-specific attribute)",
                    vendor_type,
                    vendor_length);
             ND_PRINT("\n\t    Vendor Attribute: %u, Length: %u (bogus, goes past end of vendor-specific attribute)",
                    vendor_type,
                    vendor_length);


@@ -902,21 +899,18 @@ print_attr_num(netdissect_options *ndo,
 {
    uint32_t timeout;
 
 {
    uint32_t timeout;
 

-   if (length != 4)
-   {
+   if (length != 4) {

        ND_PRINT("ERROR: length %u != 4", length);
        return;
    }
 
                           /* This attribute has standard values */
        ND_PRINT("ERROR: length %u != 4", length);
        return;
    }
 
                           /* This attribute has standard values */

-   if (attr_type[attr_code].siz_subtypes)
-   {
+   if (attr_type[attr_code].siz_subtypes) {

       static const char **table;
       uint32_t data_value;
       table = attr_type[attr_code].subtypes;
 
       static const char **table;
       uint32_t data_value;
       table = attr_type[attr_code].subtypes;
 

-      if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) )
-      {
+      if ( (attr_code == TUNNEL_TYPE) || (attr_code == TUNNEL_MEDIUM) ) {

          if (!GET_U_1(data))
             ND_PRINT("Tag[Unused] ");
          else
          if (!GET_U_1(data))
             ND_PRINT("Tag[Unused] ");
          else


@@ -1017,8 +1011,7 @@ static void
 print_attr_address(netdissect_options *ndo,
                    const u_char *data, u_int length, u_short attr_code)
 {
 print_attr_address(netdissect_options *ndo,
                    const u_char *data, u_int length, u_short attr_code)
 {

-   if (length != 4)
-   {
+   if (length != 4) {

        ND_PRINT("ERROR: length %u != 4", length);
        return;
    }
        ND_PRINT("ERROR: length %u != 4", length);
        return;
    }


@@ -1053,8 +1046,7 @@ static void
 print_attr_address6(netdissect_options *ndo,
                    const u_char *data, u_int length, u_short attr_code _U_)
 {
 print_attr_address6(netdissect_options *ndo,
                    const u_char *data, u_int length, u_short attr_code _U_)
 {

-   if (length != 16)
-   {
+   if (length != 16) {

        ND_PRINT("ERROR: length %u != 16", length);
        return;
    }
        ND_PRINT("ERROR: length %u != 16", length);
        return;
    }


@@ -1068,14 +1060,12 @@ print_attr_netmask6(netdissect_options *ndo,
 {
    u_char data2[16];
 
 {
    u_char data2[16];
 

-   if (length < 2 || length > 18)
-   {
+   if (length < 2 || length > 18) {

        ND_PRINT("ERROR: length %u not in range (2..18)", length);
        return;
    }
    ND_TCHECK_LEN(data, length);
        ND_PRINT("ERROR: length %u not in range (2..18)", length);
        return;
    }
    ND_TCHECK_LEN(data, length);

-   if (GET_U_1(data + 1) > 128)
-   {
+   if (GET_U_1(data + 1) > 128) {

       ND_PRINT("ERROR: netmask %u not in range (0..128)", GET_U_1(data + 1));
       return;
    }
       ND_PRINT("ERROR: netmask %u not in range (0..128)", GET_U_1(data + 1));
       return;
    }


@@ -1099,14 +1089,12 @@ static void
 print_attr_mip6_home_link_prefix(netdissect_options *ndo,
                     const u_char *data, u_int length, u_short attr_code _U_)
 {
 print_attr_mip6_home_link_prefix(netdissect_options *ndo,
                     const u_char *data, u_int length, u_short attr_code _U_)
 {

-   if (length != 17)
-   {
+   if (length != 17) {

       ND_PRINT("ERROR: length %u != 17", length);
       return;
    }
    ND_TCHECK_LEN(data, length);
       ND_PRINT("ERROR: length %u != 17", length);
       return;
    }
    ND_TCHECK_LEN(data, length);

-   if (GET_U_1(data) > 128)
-   {
+   if (GET_U_1(data) > 128) {

       ND_PRINT("ERROR: netmask %u not in range (0..128)", GET_U_1(data));
       return;
    }
       ND_PRINT("ERROR: netmask %u not in range (0..128)", GET_U_1(data));
       return;
    }


@@ -1126,8 +1114,7 @@ print_attr_operator_name(netdissect_options *ndo,
    u_int namespace_value;
 
    ND_TCHECK_LEN(data, length);
    u_int namespace_value;
 
    ND_TCHECK_LEN(data, length);

-   if (length < 2)
-   {
+   if (length < 2) {

       ND_PRINT("ERROR: length %u < 2", length);
       return;
    }
       ND_PRINT("ERROR: length %u < 2", length);
       return;
    }


@@ -1151,8 +1138,7 @@ print_attr_location_information(netdissect_options *ndo,
    uint8_t code, entity;
 
    ND_TCHECK_LEN(data, length);
    uint8_t code, entity;
 
    ND_TCHECK_LEN(data, length);

-   if (length < 21)
-   {
+   if (length < 21) {

      ND_PRINT("ERROR: length %u < 21", length);
       return;
    }
      ND_PRINT("ERROR: length %u < 21", length);
       return;
    }


@@ -1199,8 +1185,7 @@ print_attr_location_data(netdissect_options *ndo,
    uint16_t index;
 
    ND_TCHECK_LEN(data, length);
    uint16_t index;
 
    ND_TCHECK_LEN(data, length);

-   if (length < 3)
-   {
+   if (length < 3) {

      ND_PRINT("ERROR: length %u < 3", length);
       return;
    }
      ND_PRINT("ERROR: length %u < 3", length);
       return;
    }


@@ -1231,8 +1216,7 @@ print_basic_location_policy_rules(netdissect_options *ndo,
    uint16_t flags;
 
    ND_TCHECK_LEN(data, length);
    uint16_t flags;
 
    ND_TCHECK_LEN(data, length);

-   if (length < 10)
-   {
+   if (length < 10) {

      ND_PRINT("ERROR: length %u < 10", length);
       return;
    }
      ND_PRINT("ERROR: length %u < 10", length);
       return;
    }


@@ -1273,8 +1257,7 @@ print_attr_time(netdissect_options *ndo,
    time_t attr_time;
    char string[26];
 
    time_t attr_time;
    char string[26];
 

-   if (length != 4)
-   {
+   if (length != 4) {

        ND_PRINT("ERROR: length %u != 4", length);
        return;
    }
        ND_PRINT("ERROR: length %u != 4", length);
        return;
    }


@@ -1293,8 +1276,7 @@ print_attr_vector64(netdissect_options *ndo,
    uint64_t data_value, i;
    const char *sep = "";
 
    uint64_t data_value, i;
    const char *sep = "";
 

-   if (length != 8)
-   {
+   if (length != 8) {

        ND_PRINT("ERROR: length %u != 8", length);
        return;
    }
        ND_PRINT("ERROR: length %u != 8", length);
        return;
    }


@@ -1333,8 +1315,7 @@ print_attr_strange(netdissect_options *ndo,
    switch(attr_code)
    {
       case ARAP_PASS:
    switch(attr_code)
    {
       case ARAP_PASS:

-           if (length != 16)
-           {
+           if (length != 16) {

                ND_PRINT("ERROR: length %u != 16", length);
                return;
            }
                ND_PRINT("ERROR: length %u != 16", length);
                return;
            }


@@ -1348,8 +1329,7 @@ print_attr_strange(netdissect_options *ndo,
         break;
 
       case ARAP_FEATURES:
         break;
 
       case ARAP_FEATURES:

-           if (length != 14)
-           {
+           if (length != 14) {

                ND_PRINT("ERROR: length %u != 14", length);
                return;
            }
                ND_PRINT("ERROR: length %u != 14", length);
                return;
            }


@@ -1372,8 +1352,7 @@ print_attr_strange(netdissect_options *ndo,
         break;
 
       case ARAP_CHALLENGE_RESP:
         break;
 
       case ARAP_CHALLENGE_RESP:

-           if (length < 8)
-           {
+           if (length < 8) {

                ND_PRINT("ERROR: length %u != 8", length);
                return;
            }
                ND_PRINT("ERROR: length %u != 8", length);
                return;
            }


@@ -1382,8 +1361,7 @@ print_attr_strange(netdissect_options *ndo,
         break;
 
       case ERROR_CAUSE:
         break;
 
       case ERROR_CAUSE:

-           if (length != 4)
-           {
+           if (length != 4) {

                ND_PRINT("Error: length %u != 4", length);
                return;
            }
                ND_PRINT("Error: length %u != 4", length);
                return;
            }


@@ -1419,22 +1397,18 @@ radius_attrs_print(netdissect_options *ndo,
                attr_string,
                type,
                len);
                attr_string,
                type,
                len);

-     if (len < 2)
-     {
+     if (len < 2) {

        ND_PRINT(" (bogus, must be >= 2)");
        return;
      }
        ND_PRINT(" (bogus, must be >= 2)");
        return;
      }

-     if (len > length)
-     {
+     if (len > length) {

         ND_PRINT(" (bogus, goes past end of packet)");
         return;
      }
      ND_PRINT(", Value: ");
 
         ND_PRINT(" (bogus, goes past end of packet)");
         return;
      }
      ND_PRINT(", Value: ");
 

-     if (type < TAM_SIZE(attr_type))
-     {
-         if (len > 2)
-         {
+     if (type < TAM_SIZE(attr_type)) {
+         if (len > 2) {

              if ( attr_type[type].print_func )
                  (*attr_type[type].print_func)(
                      ndo, ((const u_char *)(rad_attr+1)),
              if ( attr_type[type].print_func )
                  (*attr_type[type].print_func)(
                      ndo, ((const u_char *)(rad_attr+1)),


@@ -1466,8 +1440,7 @@ radius_print(netdissect_options *ndo,
    rad = (const struct radius_hdr *)dat;
    len = GET_BE_U_2(rad->len);
 
    rad = (const struct radius_hdr *)dat;
    len = GET_BE_U_2(rad->len);
 

-   if (len < MIN_RADIUS_LEN)
-   {
+   if (len < MIN_RADIUS_LEN) {

          nd_print_trunc(ndo);
          return;
    }
          nd_print_trunc(ndo);
          return;
    }

diff --git a/print-stp.c b/print-stp.c
index a4d49c4797f87059e89190c9b9dc18a3476fcd82..bfaf37826500b7fe47d4cae30c95fe13b9f4cec3 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -443,8 +443,7 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
             }
             stp_print_mstp_bpdu(ndo, stp_bpdu, length);
 
             }
             stp_print_mstp_bpdu(ndo, stp_bpdu, length);
 

-            if (protocol_version == STP_PROTO_SPB)
-            {
+            if (protocol_version == STP_PROTO_SPB) {

               /* Validate v4 length */
               spb_len = GET_BE_U_2(p + MST_BPDU_VER3_LEN_OFFSET + mstp_len);
               spb_len += 2;
               /* Validate v4 length */
               spb_len = GET_BE_U_2(p + MST_BPDU_VER3_LEN_OFFSET + mstp_len);
               spb_len += 2;

diff --git a/print-syslog.c b/print-syslog.c
index b0e1c91aa78457ebdc5b560900417d5be393d112..25cfa842cef69a96c53f1d852135d0f62c210257 100644 (file)
--- a/print-syslog.c
+++ b/print-syslog.c
@@ -109,8 +109,7 @@ syslog_print(netdissect_options *ndo,
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 
     facility = (pri & SYSLOG_FACILITY_MASK) >> 3;
     severity = pri & SYSLOG_SEVERITY_MASK;
 

-    if (ndo->ndo_vflag < 1 )
-    {
+    if (ndo->ndo_vflag < 1 ) {

         ND_PRINT("SYSLOG %s.%s, length: %u",
                tok2str(syslog_facility_values, "unknown (%u)", facility),
                tok2str(syslog_severity_values, "unknown (%u)", severity),
         ND_PRINT("SYSLOG %s.%s, length: %u",
                tok2str(syslog_facility_values, "unknown (%u)", facility),
                tok2str(syslog_severity_values, "unknown (%u)", severity),