Fix formatting from rename.

Author: gbrail

apib/apib_cpu_bsd.cc

@@ -14,11 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/* Don't let clang-format sort includes, or this will not compile. */
+/* clang-format off */
+/* Won't compile if sorted. */
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/times.h>
 #include <unistd.h>
+/* clang-format on */
 
 #include <cstring>
 

apib/apib_iothread.cc

@@ -22,13 +22,13 @@ limitations under the License.
 #include <thread>
 
 #include "absl/strings/str_join.h"
-#include "ev.h"
 #include "apib/apib_lines.h"
 #include "apib/apib_rand.h"
 #include "apib/apib_reporting.h"
 #include "apib/apib_time.h"
 #include "apib/apib_url.h"
 #include "apib/apib_util.h"
+#include "ev.h"
 
 namespace apib {
 

apib/apib_iothread.h

@@ -26,13 +26,13 @@ limitations under the License.
 #include <thread>
 #include <vector>
 
-#include "ev.h"
-#include "http_parser.h"
 #include "apib/apib_commandqueue.h"
 #include "apib/apib_lines.h"
 #include "apib/apib_oauth.h"
 #include "apib/apib_rand.h"
 #include "apib/apib_url.h"
+#include "ev.h"
+#include "http_parser.h"
 
 namespace apib {
 

apib/apib_mon.h

@@ -22,8 +22,8 @@ limitations under the License.
 #include <thread>
 
 #include "absl/strings/string_view.h"
-#include "ev.h"
 #include "apib/apib_cpu.h"
+#include "ev.h"
 
 namespace apib {
 

apib/apib_url.cc

@@ -28,9 +28,9 @@ limitations under the License.
 #include <iostream>
 #include <sstream>
 
-#include "http_parser.h"
 #include "apib/apib_lines.h"
 #include "apib/apib_util.h"
+#include "http_parser.h"
 
 #define URL_BUF_LEN 8192
 #define INITIAL_URLS 16

test/commandqueue_test.cc

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "gtest/gtest.h"
 #include "apib/apib_commandqueue.h"
+#include "gtest/gtest.h"
 
 using apib::Command;
 using apib::CommandQueue;

test/cpu_test.cc

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "gtest/gtest.h"
 #include "apib/apib_cpu.h"
+#include "gtest/gtest.h"
 
 namespace {
 

test/io_test.cc

@@ -16,10 +16,10 @@ limitations under the License.
 
 #include <iostream>
 
-#include "gtest/gtest.h"
 #include "apib/apib_iothread.h"
 #include "apib/apib_reporting.h"
 #include "apib/apib_url.h"
+#include "gtest/gtest.h"
 #include "test/test_server.h"
 
 using apib::BenchmarkResults;

test/lines_test.cc

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "gtest/gtest.h"
 #include "apib/apib_lines.h"
+#include "gtest/gtest.h"
 
 using apib::LineState;
 

test/mon_test.cc

@@ -24,11 +24,11 @@ limitations under the License.
 #include <iostream>
 
 #include "absl/strings/numbers.h"
-#include "gtest/gtest.h"
 #include "apib/apib_cpu.h"
 #include "apib/apib_lines.h"
 #include "apib/apib_mon.h"
 #include "apib/apib_util.h"
+#include "gtest/gtest.h"
 
 using std::cout;
 using std::endl;

test/oauth_test.cc

@@ -16,8 +16,8 @@ limitations under the License.
 
 #include <regex>
 
-#include "gtest/gtest.h"
 #include "apib/apib_oauth.h"
+#include "gtest/gtest.h"
 
 namespace {
 

test/reporting_test.cc

@@ -16,9 +16,9 @@ limitations under the License.
 
 #include <memory>
 
-#include "gtest/gtest.h"
 #include "apib/apib_iothread.h"
 #include "apib/apib_reporting.h"
+#include "gtest/gtest.h"
 
 using apib::BenchmarkIntervalResults;
 using apib::BenchmarkResults;

test/test_server.cc

@@ -34,9 +34,9 @@ limitations under the License.
 
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_split.h"
-#include "http_parser.h"
 #include "apib/apib_lines.h"
 #include "apib/apib_util.h"
+#include "http_parser.h"
 
 using std::cerr;
 using std::cout;

test/tls_test.cc

@@ -17,10 +17,10 @@ limitations under the License.
 #include <assert.h>
 #include <openssl/ssl.h>
 
-#include "gtest/gtest.h"
 #include "apib/apib_iothread.h"
 #include "apib/apib_reporting.h"
 #include "apib/apib_url.h"
+#include "gtest/gtest.h"
 #include "test/test_keygen.h"
 #include "test/test_server.h"
 

test/url_test.cc

@@ -22,9 +22,9 @@ limitations under the License.
 #include <iostream>
 #include <memory>
 
-#include "gtest/gtest.h"
 #include "apib/apib_rand.h"
 #include "apib/apib_url.h"
+#include "gtest/gtest.h"
 
 using apib::URLInfo;
 

test/util_test.cc

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "gtest/gtest.h"
 #include "apib/apib_util.h"
+#include "gtest/gtest.h"
 
 using apib::eqcase;
 

tools/checkformat

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 exitCode=0
-for f in src/*.h src/*.cc test/*.h test/*.cc
+for f in apib/*.h apib/*.cc test/*.h test/*.cc
 do
   replacements=`clang-format --style=google --output-replacements-xml ${f} | grep '<replacement ' | wc -l`
   if [ ${replacements} -gt 0 ]
@@ -16,7 +16,7 @@ then
   echo ""
   echo "******"
   echo "Some files need formatting."
-  echo "Run checkformat -i --style=google on each"
+  echo "Run clang-format -i --style=google on each"
   echo "******"
 fi