update time due to rebase

minio · Mar 18, 2024 · 13609c1 · 13609c1
1 parent 5069c55
commit 13609c1
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 29 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Declare files that will always have LF line endings on checkout.
+*.sh test eol=lf
diff --git a/include/args.h b/include/args.h
@@ -17,7 +17,6 @@
 #define _MINIO_S3_ARGS_H
 
 #include <functional>
-#include <iosfwd>
 #include <list>
 #include <map>
 #include <string>

diff --git a/include/credentials.h b/include/credentials.h
@@ -55,12 +55,12 @@ struct Credentials {
 
   Credentials(error::Error err, std::string&& access_key,
               std::string&& secret_key, std::string&& session_token,
-              utils::Time expiration)
+              utils::UtcTime expiration)
       : err(err),
         access_key(std::move(access_key)),
         secret_key(std::move(secret_key)),
         session_token(std::move(session_token)),
-        expiration(expiration) {}
+        expiration(std::move(expiration)) {}
 
   ~Credentials() = default;
 

diff --git a/include/error.h b/include/error.h
@@ -16,8 +16,9 @@
 #ifndef _MINIO_ERROR_H
 #define _MINIO_ERROR_H
 
-#include <iosfwd>
+#include <ostream>
 #include <string>
+#include <type_traits>
 
 namespace minio {
 namespace error {
@@ -32,9 +33,9 @@ class Error {
   Error(const Error&) = default;
   Error& operator=(const Error&) = default;
 
-  Error(Error&& v) : msg_(std::move(v.msg_)) {}
+  Error(Error&& v) noexcept : msg_(std::move(v.msg_)) {}
 
-  Error& operator=(Error&& v) {
+  Error& operator=(Error&& v) noexcept {
     if (this != &v) {
       msg_ = std::move(v.msg_);
     }

diff --git a/include/types.h b/include/types.h
@@ -18,11 +18,10 @@
 
 #include <exception>
 #include <functional>
-#include <iosfwd>
 #include <iostream>
 #include <list>
 #include <map>
-#include <nlohmann/json.hpp>
+#include <nlohmann/json_fwd.hpp>
 #include <ostream>
 #include <string>
 #include <type_traits>
@@ -318,7 +317,7 @@ struct Bucket {
   utils::UtcTime creation_date;
 
   Bucket() = default;
-  Bucket(std::string&& name, utils::Time&& creation_date)
+  Bucket(std::string&& name, utils::UtcTime&& creation_date)
       : name(std::move(name)), creation_date(std::move(creation_date)) {}
   ~Bucket() = default;
 };  // struct Bucket

diff --git a/include/utils.h b/include/utils.h
@@ -17,14 +17,13 @@
 #define _MINIO_UTILS_H
 
 #ifdef _WIN32
-#include <Winsock2.h>  // NOTE: needed for struct timeval
+#include <corecrt.h>
 #else
 #include <pwd.h>
 #endif
 
+#include <ctime>
 #include <ios>
-#include <iosfwd>
-#include <iostream>
 #include <list>
 #include <map>
 #include <set>

diff --git a/src/args.cc b/src/args.cc
@@ -18,7 +18,6 @@
 #include <curlpp/cURLpp.hpp>
 #include <exception>
 #include <filesystem>
-#include <iosfwd>
 #include <iostream>
 #include <map>
 #include <nlohmann/json.hpp>

diff --git a/src/baseclient.cc b/src/baseclient.cc
@@ -18,7 +18,6 @@
 #include <cstring>
 #include <exception>
 #include <functional>
-#include <iosfwd>
 #include <iostream>
 #include <list>
 #include <map>

diff --git a/src/client.cc b/src/client.cc
@@ -18,7 +18,6 @@
 #include <curlpp/cURLpp.hpp>
 #include <filesystem>
 #include <fstream>
-#include <iosfwd>
 #include <list>
 #include <memory>
 #include <string>

diff --git a/src/http.cc b/src/http.cc
@@ -14,8 +14,6 @@
 // limitations under the License.
 
 #include <curl/curl.h>
-#include <ws2def.h>    // NOTE needed for AF_INET6
-#include <ws2ipdef.h>  // NOTE needed for sockaddr_in6
 
 #include <curlpp/Easy.hpp>
 #include <curlpp/Exception.hpp>
@@ -36,6 +34,9 @@
 
 #ifdef _WIN32
 #include <ws2tcpip.h>
+#include <ws2def.h>    // NOTE needed for AF_INET6
+#include <ws2ipdef.h>  // NOTE needed for sockaddr_in6
+#include <WinSock2.h>
 #else
 #include <arpa/inet.h>
 #endif
@@ -397,9 +398,9 @@ minio::http::Response minio::http::Request::execute() {
   while (!requests.perform(&left)) {
   }
   while (left) {
-    fd_set fdread;
-    fd_set fdwrite;
-    fd_set fdexcep;
+    fd_set fdread{};
+    fd_set fdwrite{};
+    fd_set fdexcep{};
     int maxfd = 0;
 
     FD_ZERO(&fdread);

diff --git a/src/providers.cc b/src/providers.cc
@@ -18,16 +18,19 @@
 #endif
 
 #include <INIReader.h>
-#include <WS2tcpip.h>
 
 #include <fstream>
-#include <iosfwd>
 #include <list>
 #include <nlohmann/json.hpp>
 #include <string>
 #include <type_traits>
+#include <iosfwd>
 
-#ifndef _WIN32
+#ifdef _WIN32
+#include <WinSock2.h>
+#include <ws2def.h>
+#include <ws2tcpip.h>
+#else
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/socket.h>

diff --git a/src/utils.cc b/src/utils.cc
@@ -15,17 +15,14 @@
 
 #ifdef _WIN32
 #define _CRT_SECURE_NO_WARNINGS
+#include <corecrt.h>
 #endif
 
-#include "utils.h"
-
-#include <corecrt.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
-#include <openssl/ossl_typ.h>
-#include <sys/types.h>
+#include <openssl/types.h>
 #include <zconf.h>
 #include <zlib.h>
 
@@ -55,6 +52,7 @@
 #include <vector>
 
 #include "error.h"
+#include "utils.h"
 
 const std::string WEEK_DAYS[] = {"Sun", "Mon", "Tue", "Wed",
                                  "Thu", "Fri", "Sat"};

diff --git a/tests/tests.cc b/tests/tests.cc
@@ -556,7 +556,9 @@ class Tests {
         args.bucket = bucket_name_;
         args.object = object_name;
         minio::s3::PutObjectResponse resp = client_.PutObject(args);
-        if (!resp) std::runtime_error("PutObject(): " + resp.Error().String());
+        if (!resp) {
+          throw std::runtime_error("PutObject(): " + resp.Error().String());
+        }
         object_names.push_back(object_name);
       }
       RemoveObjects(object_names);