vpnor: Shuffle and rework includes for sanity

Include ordering and whether or not C linkage is forced by `extern "C"`
blocks can cause headaches at link time. Ensure that all C dependencies
are included in an `extern C` block before other includes occur. Also
include the C++ versions of string.h and assert.h

Change-Id: Ia96f6044d40c8eccb907b65924efcf62ac7a89c3
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>

vpnor/test/create_pnor_partition_table.cpp

@@ -4,8 +4,8 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 extern "C" {
 #include "test/mbox.h"

vpnor/test/create_read_window_oob.cpp

@@ -3,11 +3,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <string.h>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
@@ -15,6 +10,11 @@ extern "C" {
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+#include <cstring>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 const std::string toc[] = {
     "partition01=HBB,00001000,00002000,80,ECC,READONLY",
 };

vpnor/test/create_read_window_partition_exists.cpp

@@ -3,15 +3,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <string.h>
-
-#include <experimental/filesystem>
-#include <fstream>
-#include <vector>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
@@ -19,6 +10,14 @@ extern "C" {
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+#include <cstring>
+#include <experimental/filesystem>
+#include <fstream>
+#include <vector>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 // A read window assumes that the toc is located at offset 0,
 // so create dummy partition at arbitrary offset 0x1000.
 const std::string toc[] = {

vpnor/test/create_read_window_partition_invalid.cpp

@@ -3,11 +3,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <string.h>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
@@ -15,6 +10,11 @@ extern "C" {
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+#include <cstring>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 const std::string toc[] = {
     "partition01=HBB,00002000,00003000,80,ECC,READONLY",
 };

vpnor/test/create_read_window_remap.cpp

@@ -3,15 +3,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <string.h>
-
-#include <experimental/filesystem>
-#include <fstream>
-#include <vector>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
@@ -19,6 +10,14 @@ extern "C" {
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+#include <cstring>
+#include <experimental/filesystem>
+#include <fstream>
+#include <vector>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 static const auto BLOCK_SIZE = 4096;
 static const auto ERASE_SIZE = BLOCK_SIZE;
 static const auto WINDOW_SIZE = 16 * BLOCK_SIZE;

vpnor/test/create_read_window_size.cpp

@@ -3,18 +3,18 @@
 
 #include "config.h"
 
-#include <assert.h>
-
-#include <experimental/filesystem>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
 }
 
 #include "vpnor/test/tmpd.hpp"
+
+#include <cassert>
+#include <experimental/filesystem>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 static const auto BLOCK_SIZE = 4096;
 static const auto ERASE_SIZE = BLOCK_SIZE;
 static const auto WINDOW_SIZE = 2 * BLOCK_SIZE;

vpnor/test/create_read_window_straddle_partitions.cpp

@@ -3,11 +3,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <string.h>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
@@ -15,6 +10,11 @@ extern "C" {
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+#include <cstring>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 const std::string toc[] = {
     "partition01=ONE,00001000,00002000,80,ECC,READONLY",
     "partition02=TWO,00002000,00003000,80,ECC,READONLY",

vpnor/test/create_read_window_toc.cpp

@@ -4,10 +4,11 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
-#include <string.h>
 #include <sys/mman.h>
 
+#include <cassert>
+#include <cstring>
+
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"

vpnor/test/create_write_window_ro_partition.cpp

@@ -3,10 +3,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
@@ -14,6 +10,10 @@ extern "C" {
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 const std::string toc[] = {
     "partition01=HBB,00001000,00002000,80,ECC,READONLY",
 };

vpnor/test/create_write_window_rw_partition.cpp

@@ -3,10 +3,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
@@ -14,6 +10,10 @@ extern "C" {
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 const std::string toc[] = {
     "partition01=HBB,00001000,00002000,80,ECC,READWRITE",
 };

vpnor/test/create_write_window_unmapped.cpp

@@ -3,10 +3,6 @@
 
 #include "config.h"
 
-#include <assert.h>
-
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
@@ -14,6 +10,10 @@ extern "C" {
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 static constexpr auto BLOCK_SIZE = 0x1000;
 static constexpr auto ERASE_SIZE = BLOCK_SIZE;
 static constexpr auto N_WINDOWS = 1;

vpnor/test/dump_flash.cpp

@@ -3,19 +3,19 @@
 
 #include "config.h"
 
-#include <assert.h>
-#include <string.h>
-
-#include "transport_mbox.h"
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"
+#include "transport_mbox.h"
 }
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+#include <cstring>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 struct test_context
 {
     uint8_t seq;

vpnor/test/force_readonly_toc.cpp

@@ -4,11 +4,12 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
 #include <endian.h>
-#include <string.h>
 #include <sys/mman.h>
 
+#include <cassert>
+#include <cstring>
+
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"

vpnor/test/read_patch.cpp

@@ -3,18 +3,18 @@
 
 #include "config.h"
 
-#include <assert.h>
-
-#include "common.h"
-#include "vpnor/mboxd_pnor_partition_table.h"
-
 extern "C" {
+#include "common.h"
 #include "test/mbox.h"
 #include "test/system.h"
 }
 
 #include "vpnor/test/tmpd.hpp"
 
+#include <cassert>
+
+#include "vpnor/mboxd_pnor_partition_table.h"
+
 static constexpr auto BLOCK_SIZE = 0x1000;
 static constexpr auto ERASE_SIZE = BLOCK_SIZE;
 static constexpr auto PART_SIZE = BLOCK_SIZE * 4;

vpnor/test/tmpd.hpp

@@ -3,17 +3,18 @@
 
 #include "config.h"
 
-#include "vpnor/pnor_partition_table.hpp"
+extern "C" {
+#include "mboxd.h"
+}
 
-#include <assert.h>
-#include <string.h>
+#include "vpnor/pnor_partition_table.hpp"
 
+#include <cassert>
+#include <cstring>
 #include <experimental/filesystem>
 #include <fstream>
 #include <vector>
 
-#include "mboxd.h"
-
 namespace openpower
 {
 namespace virtual_pnor

vpnor/test/toc_flags.cpp

@@ -5,7 +5,7 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 #include "common.h"
 #include "vpnor/pnor_partition_defs.h"

vpnor/test/toc_lookup_failed.cpp

@@ -5,8 +5,8 @@
 #include "vpnor/pnor_partition_table.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 extern "C" {
 #include "test/mbox.h"

vpnor/test/toc_lookup_found.cpp

@@ -4,8 +4,8 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 extern "C" {
 #include "test/mbox.h"

vpnor/test/toc_missing_file.cpp

@@ -4,8 +4,8 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 extern "C" {
 #include "test/mbox.h"

vpnor/test/toc_no_end.cpp

@@ -5,7 +5,7 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr auto BLOCK_SIZE = 4 * 1024;
 

vpnor/test/toc_no_name.cpp

@@ -5,7 +5,7 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr auto BLOCK_SIZE = 4 * 1024;
 

vpnor/test/toc_no_start.cpp

@@ -5,7 +5,7 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr auto BLOCK_SIZE = 4 * 1024;
 

vpnor/test/toc_no_version.cpp

@@ -5,7 +5,7 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr auto BLOCK_SIZE = 4 * 1024;
 

vpnor/test/toc_overlap.cpp

@@ -4,8 +4,8 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 extern "C" {
 #include "test/mbox.h"

vpnor/test/toc_start_gt_end.cpp

@@ -5,7 +5,7 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
+#include <cassert>
 
 static constexpr auto BLOCK_SIZE = 4 * 1024;
 

vpnor/test/write_patch.cpp

@@ -3,23 +3,23 @@
 
 #include "config.h"
 
-#include <assert.h>
+extern "C" {
+#include "common.h"
+#include "flash.h"
+#include "mboxd.h"
+}
+
+#include "vpnor/test/tmpd.hpp"
+
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/syslog.h>
 #include <unistd.h>
 
+#include <cassert>
 #include <experimental/filesystem>
 
-#include "common.h"
-#include "mboxd.h"
-extern "C" {
-#include "flash.h"
-}
-
-#include "vpnor/test/tmpd.hpp"
-
 static constexpr auto BLOCK_SIZE = 0x1000;
 static constexpr auto DATA_SIZE = 8;
 

vpnor/test/write_patch_resize.cpp

@@ -3,7 +3,14 @@
 
 #include "config.h"
 
-#include <assert.h>
+extern "C" {
+#include "common.h"
+#include "flash.h"
+#include "mboxd.h"
+}
+
+#include "vpnor/test/tmpd.hpp"
+
 #include <fcntl.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
@@ -11,17 +18,9 @@
 #include <sys/syslog.h>
 #include <unistd.h>
 
+#include <cassert>
 #include <experimental/filesystem>
 
-#include "common.h"
-#include "mboxd.h"
-
-extern "C" {
-#include "flash.h"
-}
-
-#include "vpnor/test/tmpd.hpp"
-
 static constexpr auto BLOCK_SIZE = 0x1000;
 static constexpr auto PART_SIZE = BLOCK_SIZE;
 static constexpr auto PATCH_SIZE = BLOCK_SIZE / 2;

vpnor/test/write_prsv.cpp

 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2018 IBM Corp.
 
-#include <assert.h>
+extern "C" {
+#include "common.h"
+#include "flash.h"
+#include "mboxd.h"
+}
+
+#include "vpnor/test/tmpd.hpp"
+
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "common.h"
-#include "mboxd.h"
-extern "C" {
-#include "flash.h"
-}
-
-#include "vpnor/test/tmpd.hpp"
+#include <cassert>
 
 static constexpr auto BLOCK_SIZE = 0x1000;
 

vpnor/test/write_ro.cpp

 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2018 IBM Corp.
+#include "config.h"
+
+extern "C" {
+#include "common.h"
+#include "flash.h"
+#include "mboxd.h"
+}
+
+#include "vpnor/test/tmpd.hpp"
 
-#include <assert.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "common.h"
-#include "mboxd.h"
-
-extern "C" {
-#include "flash.h"
-}
-
-#include "vpnor/test/tmpd.hpp"
+#include <cassert>
 
 static constexpr auto BLOCK_SIZE = 0x1000;
 

vpnor/test/write_rw.cpp

 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2018 IBM Corp.
+#include "config.h"
+
+extern "C" {
+#include "common.h"
+#include "flash.h"
+#include "mboxd.h"
+}
+
+#include "vpnor/test/tmpd.hpp"
 
-#include <assert.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "common.h"
-#include "mboxd.h"
-extern "C" {
-#include "flash.h"
-}
-
-#include "vpnor/test/tmpd.hpp"
+#include <cassert>
 
 static constexpr auto BLOCK_SIZE = 0x1000;
 

vpnor/test/write_toc.cpp

@@ -4,10 +4,11 @@
 
 #include "vpnor/pnor_partition_table.hpp"
 
-#include <assert.h>
-#include <string.h>
 #include <sys/mman.h>
 
+#include <cassert>
+#include <cstring>
+
 extern "C" {
 #include "test/mbox.h"
 #include "test/system.h"