[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 925f946 05/22: Include headers iff appropriat
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 925f946 05/22: Include headers iff appropriate |
Date: |
Sat, 28 Mar 2020 18:23:36 -0400 (EDT) |
branch: master
commit 925f9460bf7e9438ec7b06b1fa6fba7215d9441d
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Include headers iff appropriate
---
authenticity.cpp | 6 ++----
authenticity.hpp | 2 --
authenticity_test.cpp | 3 +--
generate_passkey.cpp | 6 +++---
md5sum.cpp | 8 ++++++--
md5sum.hpp | 2 ++
md5sum_cli.cpp | 3 +++
md5sum_test.cpp | 15 ++++++---------
8 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/authenticity.cpp b/authenticity.cpp
index 6bf24e0..f752713 100644
--- a/authenticity.cpp
+++ b/authenticity.cpp
@@ -24,15 +24,12 @@
#include "authenticity.hpp"
#include "alert.hpp"
-#include "assert_lmi.hpp"
#include "calendar_date.hpp"
#include "global_settings.hpp"
#include "handle_exceptions.hpp"
#include "md5.hpp"
#include "md5sum.hpp"
#include "path_utility.hpp" // fs::path inserter
-#include "platform_dependent.hpp" // chdir()
-#include "system_command.hpp"
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/operations.hpp>
@@ -40,8 +37,9 @@
#include <cstdio> // fclose(), fopen()
#include <cstdlib> // exit(), EXIT_FAILURE
#include <cstring> // memcpy()
-#include <iomanip>
#include <sstream>
+#include <stdexcept>
+#include <vector>
// TODO ?? Known security hole: data files can be modified after they
// have been validated with 'md5sum'. This problem will grow worse
diff --git a/authenticity.hpp b/authenticity.hpp
index 928aef7..44f5859 100644
--- a/authenticity.hpp
+++ b/authenticity.hpp
@@ -25,13 +25,11 @@
#include "config.hpp"
#include "calendar_date.hpp"
-#include "md5sum.hpp"
#include "so_attributes.hpp"
#include <boost/filesystem/path.hpp>
#include <string>
-#include <vector>
/// Permit running the system iff data files and date are valid.
///
diff --git a/authenticity_test.cpp b/authenticity_test.cpp
index 9202864..7ff79a9 100644
--- a/authenticity_test.cpp
+++ b/authenticity_test.cpp
@@ -32,11 +32,10 @@
#include "test_tools.hpp"
#include <boost/filesystem/convenience.hpp> // basename()
-#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#include <cstdio>
+#include <cstdio> // remove()
#include <cstring> // memcpy(), strlen()
#include <fstream>
#include <string>
diff --git a/generate_passkey.cpp b/generate_passkey.cpp
index f454034..dc42a12 100644
--- a/generate_passkey.cpp
+++ b/generate_passkey.cpp
@@ -19,10 +19,10 @@
// email: <address@hidden>
// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-#include "authenticity.hpp" // md5sum_file()
+#include "authenticity.hpp" // md5sum_file()
#include "main_common.hpp"
-#include "md5.hpp"
-#include "md5sum.hpp" // md5_hex_string()
+#include "md5.hpp" // md5_buffer(), md5_stream()
+#include "md5sum.hpp" // md5_hex_string()
#include <cstdio>
#include <cstdlib>
diff --git a/md5sum.cpp b/md5sum.cpp
index dd6ad89..01fcf60 100644
--- a/md5sum.cpp
+++ b/md5sum.cpp
@@ -24,10 +24,14 @@
#include "assert_lmi.hpp"
#include "md5.hpp"
#include "md5sum.hpp"
-#include "miscellany.hpp"
+#include <cstddef> // size_t
#include <fstream>
-#include <memory>
+#include <iomanip> // hex, setfill(), setw()
+#include <ios> // ios_base, streamsize
+#include <istream>
+#include <sstream>
+#include <stdexcept>
std::vector<md5sum_for_file> md5_read_checksum_stream
(std::istream& is
diff --git a/md5sum.hpp b/md5sum.hpp
index 41ded78..cb86f93 100644
--- a/md5sum.hpp
+++ b/md5sum.hpp
@@ -28,7 +28,9 @@
#include <boost/filesystem/path.hpp>
#include <climits> // CHAR_BIT
+#include <iosfwd>
#include <string>
+#include <utility> // move()
#include <vector>
// The gnu libc md5 implementation seems to assume this:
diff --git a/md5sum_cli.cpp b/md5sum_cli.cpp
index d243f71..629c066 100644
--- a/md5sum_cli.cpp
+++ b/md5sum_cli.cpp
@@ -25,7 +25,10 @@
#include "main_common.hpp"
#include "md5sum.hpp"
+#include <cstdio> // fflush()
#include <iostream>
+#include <stdexcept>
+#include <string>
int usage(int status)
{
diff --git a/md5sum_test.cpp b/md5sum_test.cpp
index a5084a9..b503613 100644
--- a/md5sum_test.cpp
+++ b/md5sum_test.cpp
@@ -21,21 +21,18 @@
#include "pchfile.hpp"
-#include "assert_lmi.hpp"
-#include "contains.hpp"
#include "md5sum.hpp"
-#include "miscellany.hpp"
-#include "system_command.hpp"
#include "test_tools.hpp"
-#include <boost/filesystem/convenience.hpp> // basename()
-#include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/operations.hpp> // fs::exists()
#include <boost/filesystem/path.hpp>
-#include <cstdio>
-#include <cstring> // memcpy(), strlen()
+#include <cstdio> // remove()
#include <fstream>
+#include <ios> // ios_base
+#include <ostream>
+#include <sstream>
+#include <stdexcept>
#include <string>
#include <vector>
- [lmi-commits] [lmi] master updated (0eafcb0 -> 6425b3b), Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master f340f72 06/22: Explicitly qualify std::size_t, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 2696d31 04/22: Update copyright notices, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 2b4947a 08/22: Write inequality comparisons in number-line order, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 063c376 10/22: Generally avoid "`" where "'" is at least as good, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 0622c32 07/22: Regularize whitespace, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master c029dd3 12/22: Improve documentation, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 4cafdca 02/22: Add lmi_md5sum utility implementing subset of standard md5sum, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master d82ac15 13/22: Split a long line, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 28956d7 14/22: Temporarily allow an "MD5 !!" marker, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 925f946 05/22: Include headers iff appropriate,
Greg Chicares <=
- [lmi-commits] [lmi] master fc09a91 03/22: Add unit tests for MD5-related functionality, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 225cf10 09/22: Avoid a warning by a different means, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 2db19f5 11/22: Remove unnecessary shared-object attributes, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 28f8ffc 15/22: Explicitly qualify std::cout, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master f14ad11 01/22: Implement MD5 checksum files reading in lmi code, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master ec4fe67 18/22: Realphabetize a list, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 8d3e03a 20/22: Expunge a disused makefile variable, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 72ee60f 17/22: Improve instructions, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 9ae6e81 19/22: Reformat and lightly revise some documentation, Greg Chicares, 2020/03/28
- [lmi-commits] [lmi] master 9c510ad 16/22: Measure elapsed time for MD5 data-file validation, Greg Chicares, 2020/03/28