commit 8bb94bad47592bbe351c9f6981e9f5b3931f34b6
author Bernie Innocenti <codewiz@google.com> Wed Oct 10 22:30:12 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Fri Oct 12 14:38:03 2018 +0900
tree fe130d45b042d916aaaa74edb2215492768bd9b2
parent caebcbb1319c9cc0915b9f186ba6689c0c674486

Fix -Wimplicit-fallthrough warnings in netd

Test: atest netd_integration_test
Change-Id: Ib5ab9661fb429fdccd6a4c4b5893831ff5fe104e

resolv/getaddrinfo.cpp

diff --git a/resolv/getaddrinfo.cpp b/resolv/getaddrinfo.cpp
index 8abfea8..123f609 100644
--- a/resolv/getaddrinfo.cpp
+++ b/resolv/getaddrinfo.cpp
@@ -1874,7 +1874,7 @@
             switch (h_errno) {
                 case NO_DATA:
                     got_nodata++;
-                    /* FALLTHROUGH */
+                    [[fallthrough]];
                 case HOST_NOT_FOUND:
                     /* keep trying */
                     break;
@@ -1884,7 +1884,7 @@
                         got_servfail++;
                         break;
                     }
-                    /* FALLTHROUGH */
+                    [[fallthrough]];
                 default:
                     /* anything else implies that we're done */
                     done++;

resolv/res_mkquery.cpp

diff --git a/resolv/res_mkquery.cpp b/resolv/res_mkquery.cpp
index 82c42d5..f747fce 100644
--- a/resolv/res_mkquery.cpp
+++ b/resolv/res_mkquery.cpp
@@ -131,7 +131,8 @@
      * perform opcode specific processing
      */
     switch (op) {
-        case QUERY: /*FALLTHROUGH*/
+        case QUERY:
+            [[fallthrough]];
         case NS_NOTIFY_OP:
             if (ep - cp < QFIXEDSZ) return (-1);
             if ((n = dn_comp(dname, cp, ep - cp - QFIXEDSZ, dnptrs, lastdnptr)) < 0) return (-1);

resolv/res_query.cpp

diff --git a/resolv/res_query.cpp b/resolv/res_query.cpp
index c0fe8b9..526586a 100644
--- a/resolv/res_query.cpp
+++ b/resolv/res_query.cpp
@@ -273,7 +273,7 @@
             switch (statp->res_h_errno) {
                 case NO_DATA:
                     got_nodata++;
-                    /* FALLTHROUGH */
+                    [[fallthrough]];
                 case HOST_NOT_FOUND:
                     /* keep trying */
                     break;
@@ -283,7 +283,7 @@
                         got_servfail++;
                         break;
                     }
-                    /* FALLTHROUGH */
+                    [[fallthrough]];
                 default:
                     /* anything else implies that we're done */
                     done++;

resolv/res_send.cpp

diff --git a/resolv/res_send.cpp b/resolv/res_send.cpp
index 34a6e18..86db060 100644
--- a/resolv/res_send.cpp
+++ b/resolv/res_send.cpp
@@ -543,9 +543,9 @@
                             /* give the hook another try */
                             if (++loops < 42) /*doug adams*/
                                 break;
-                            /*FALLTHROUGH*/
+                            [[fallthrough]];
                         case res_error:
-                            /*FALLTHROUGH*/
+                            [[fallthrough]];
                         default:
                             goto fail;
                     }
@@ -645,9 +645,9 @@
                             /* give the hook another try */
                             if (++loops < 42) /*doug adams*/
                                 break;
-                            /*FALLTHROUGH*/
+                            [[fallthrough]];
                         case res_error:
-                            /*FALLTHROUGH*/
+                            [[fallthrough]];
                         default:
                             goto fail;
                     }