From b889f0c395c5319047a84021d25d760c60c385f8 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Wed, 27 Jul 2022 16:53:39 -0500
Subject: [PATCH] chore: iwyu cstring, cstdlib, optional, unordered_set (#3532)

---
 cli/cli.cc                         |  4 ++--
 gtk/FileList.cc                    |  1 -
 libtransmission/announcer-common.h |  1 +
 libtransmission/announcer-http.cc  |  2 --
 libtransmission/announcer.cc       |  1 -
 libtransmission/bitfield.cc        |  1 +
 libtransmission/blocklist.cc       |  2 +-
 libtransmission/clients.cc         | 11 ++++-------
 libtransmission/platform-quota.cc  |  1 -
 libtransmission/session.cc         |  1 +
 libtransmission/session.h          |  1 +
 libtransmission/variant-json.cc    |  1 +
 libtransmission/watchdir-win32.cc  |  1 -
 libtransmission/watchdir.cc        |  1 +
 libtransmission/web-utils.cc       |  1 -
 qt/DetailsDialog.h                 |  1 +
 16 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/cli/cli.cc b/cli/cli.cc
index 195a1cc2e..8196413b7 100644
--- a/cli/cli.cc
+++ b/cli/cli.cc
@@ -5,11 +5,11 @@
 #include <array>
 #include <cstdio> /* fprintf () */
 #include <cstdlib> /* atoi () */
-#include <cstring> /* memcmp () */
-#include <signal.h>
 #include <string>
 #include <string_view>
 
+#include <signal.h>
+
 #include <fmt/format.h>
 
 #include <libtransmission/transmission.h>
diff --git a/gtk/FileList.cc b/gtk/FileList.cc
index 2e43cf7fd..1887e0a49 100644
--- a/gtk/FileList.cc
+++ b/gtk/FileList.cc
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <climits> /* INT_MAX */
 #include <cstddef>
-#include <cstring> // strchr
 #include <list>
 #include <string>
 #include <string_view>
diff --git a/libtransmission/announcer-common.h b/libtransmission/announcer-common.h
index e90cc50a3..7733a917d 100644
--- a/libtransmission/announcer-common.h
+++ b/libtransmission/announcer-common.h
@@ -11,6 +11,7 @@
 
 #include <array>
 #include <cstdint> // uint64_t
+#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/libtransmission/announcer-http.cc b/libtransmission/announcer-http.cc
index 88c6a1822..b5987e61f 100644
--- a/libtransmission/announcer-http.cc
+++ b/libtransmission/announcer-http.cc
@@ -4,9 +4,7 @@
 // License text can be found in the licenses/ folder.
 
 #include <algorithm> // std::copy_n()
-#include <climits> /* USHRT_MAX */
 #include <cstdio> /* fprintf() */
-#include <cstring> /* strchr(), memcmp(), memcpy() */
 #include <iomanip>
 #include <iostream>
 #include <iterator>
diff --git a/libtransmission/announcer.cc b/libtransmission/announcer.cc
index c9a23b694..4ef5daffe 100644
--- a/libtransmission/announcer.cc
+++ b/libtransmission/announcer.cc
@@ -8,7 +8,6 @@
 #include <cinttypes> // PRIu64
 #include <climits> // INT_MAX
 #include <cstdio>
-#include <cstring>
 #include <ctime>
 #include <deque>
 #include <iterator>
diff --git a/libtransmission/bitfield.cc b/libtransmission/bitfield.cc
index a1dec847d..64704f966 100644
--- a/libtransmission/bitfield.cc
+++ b/libtransmission/bitfield.cc
@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <array>
+#include <climits> // SIZE_MAX
 #include <vector>
 
 #include "tr-popcount.h"
diff --git a/libtransmission/blocklist.cc b/libtransmission/blocklist.cc
index f623ee1bc..6208137b2 100644
--- a/libtransmission/blocklist.cc
+++ b/libtransmission/blocklist.cc
@@ -6,7 +6,7 @@
 #include <algorithm>
 #include <cerrno>
 #include <cstdio>
-#include <cstring>
+#include <cstdlib> // bsearch()
 #include <string_view>
 #include <vector>
 
diff --git a/libtransmission/clients.cc b/libtransmission/clients.cc
index 7ef5e9e9d..3d2266be2 100644
--- a/libtransmission/clients.cc
+++ b/libtransmission/clients.cc
@@ -8,8 +8,6 @@
 #include <algorithm>
 #include <array>
 #include <cctype> /* isprint() */
-#include <cstdlib> /* strtol() */
-#include <cstring>
 #include <optional>
 #include <string_view>
 #include <tuple>
@@ -179,12 +177,11 @@ constexpr std::string_view charint(char ch)
     }
 }
 
-int strint(void const* pch, int span, int base = 0)
+int strint(char const* pch, int span, int base = 10)
 {
-    char tmp[64];
-    memcpy(tmp, pch, span);
-    tmp[span] = '\0';
-    return strtol(tmp, nullptr, base);
+    auto sv = std::string_view{ pch, static_cast<size_t>(span) };
+    auto const num = tr_parseNum<int>(sv, base);
+    return num ? *num : 0;
 }
 
 constexpr std::string_view getMnemonicEnd(uint8_t ch)
diff --git a/libtransmission/platform-quota.cc b/libtransmission/platform-quota.cc
index 2fc7dd74e..ef56076af 100644
--- a/libtransmission/platform-quota.cc
+++ b/libtransmission/platform-quota.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <cerrno>
-#include <cstring>
 #include <string>
 #include <string_view>
 
diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index d8079b10b..c62dfdae3 100644
--- a/libtransmission/session.cc
+++ b/libtransmission/session.cc
@@ -9,6 +9,7 @@
 #include <condition_variable>
 #include <csignal>
 #include <cstdint>
+#include <cstdlib> // atoi()
 #include <ctime>
 #include <iterator> // std::back_inserter
 #include <list>
diff --git a/libtransmission/session.h b/libtransmission/session.h
index 913d5d0a6..6dbc4d692 100644
--- a/libtransmission/session.h
+++ b/libtransmission/session.h
@@ -16,6 +16,7 @@
 #include <cstdint> // uintX_t
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <string>
 #include <string_view>
 #include <tuple>
diff --git a/libtransmission/variant-json.cc b/libtransmission/variant-json.cc
index 9d5b108ff..adb9c78dc 100644
--- a/libtransmission/variant-json.cc
+++ b/libtransmission/variant-json.cc
@@ -7,6 +7,7 @@
 #include <cctype>
 #include <cerrno> /* EILSEQ, EINVAL */
 #include <cmath> /* fabs() */
+#include <cstdlib>
 #include <cstring>
 #include <deque>
 #include <string_view>
diff --git a/libtransmission/watchdir-win32.cc b/libtransmission/watchdir-win32.cc
index fd9a8a615..7d65f2192 100644
--- a/libtransmission/watchdir-win32.cc
+++ b/libtransmission/watchdir-win32.cc
@@ -4,7 +4,6 @@
 // License text can be found in the licenses/ folder.
 
 #include <cstddef> /* offsetof */
-#include <cstdlib> /* realloc() */
 #include <errno.h>
 
 #include <process.h> /* _beginthreadex() */
diff --git a/libtransmission/watchdir.cc b/libtransmission/watchdir.cc
index 2780c2dd7..099592159 100644
--- a/libtransmission/watchdir.cc
+++ b/libtransmission/watchdir.cc
@@ -3,6 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include <cstring> // strcmp()
 #include <map>
 #include <memory>
 #include <string>
diff --git a/libtransmission/web-utils.cc b/libtransmission/web-utils.cc
index 088a16da5..1e2e38e97 100644
--- a/libtransmission/web-utils.cc
+++ b/libtransmission/web-utils.cc
@@ -7,7 +7,6 @@
 #include <array>
 #include <cctype>
 #include <cstddef>
-#include <cstdlib>
 #include <limits>
 #include <optional>
 #include <string>
diff --git a/qt/DetailsDialog.h b/qt/DetailsDialog.h
index 6c3101984..97783e9c0 100644
--- a/qt/DetailsDialog.h
+++ b/qt/DetailsDialog.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <memory>
+#include <unordered_set>
 
 #include <QString>
 #include <QMap>