From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 15 Dec 2016 09:14:38 +0000 (+0100)
Subject: upd: cleanups; 'std::swap' and '= {}'
X-Git-Url: http://code.wpia.club/?a=commitdiff_plain;h=205cff4fcae1f8fcc8d99ab405736ea5b9f2c52a;p=cassiopeia.git

upd: cleanups; 'std::swap' and '= {}'

Change-Id: Iec5605a0618debb539aef1924b02e4ccfb444f8d
---

diff --git a/src/crypto/CRL.cpp b/src/crypto/CRL.cpp
index a26c786..d48bc89 100644
--- a/src/crypto/CRL.cpp
+++ b/src/crypto/CRL.cpp
@@ -139,12 +139,8 @@ void CRL::setSignature( std::string signature ) {
     ASN1_BIT_STRING *sig = d2i_ASN1_BIT_STRING( NULL, &buffer, signature.size() + data - buffer );
     ASN1_TIME *a1 = d2i_ASN1_TIME( NULL, &buffer, signature.size() + data - buffer );
     ASN1_TIME *a2 = d2i_ASN1_TIME( NULL, &buffer, signature.size() + data - buffer );
-    auto tmp = *palg;
-    *palg = *alg;
-    *alg = tmp;
-    auto tmp2 = *psig;
-    *psig = *sig;
-    *sig = tmp2;
+    std::swap(*palg, *alg);
+    std::swap(*psig, *sig);
     X509_CRL_set1_lastUpdate( crl.get(), a1);
     X509_CRL_set1_nextUpdate( crl.get(), a2);
 
diff --git a/src/util.cpp b/src/util.cpp
index 8703594..95d1007 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -89,16 +89,12 @@ std::pair<bool, time_t> parseDate( const std::string& date ) {
         return std::pair<bool, time_t>( false, 0 );
     }
 
-    std::tm t;
-    t.tm_sec = 0;
-    t.tm_min = 0;
-    t.tm_hour = 0;
-    t.tm_year = std::stoi( date.substr( 0, 4 ) ) - 1900;
-    t.tm_mon = std::stoi( date.substr( 5, 2 ) ) - 1;
-    t.tm_mday = std::stoi( date.substr( 8, 2 ) );
-    t.tm_wday = 0;   /* Day of the week (0-6, Sunday = 0) */
-    t.tm_yday = 0;   /* Day in the year (0-365, 1 Jan = 0) */
-    t.tm_isdst = 0;  /* Daylight saving time */
+    std::tm t = {
+      .tm_sec = 0, .tm_min = 0, .tm_hour = 0,
+      .tm_mday = std::stoi( date.substr( 8, 2 ) ),
+      .tm_mon = std::stoi( date.substr( 5, 2 ) ) - 1,
+      .tm_year = std::stoi( date.substr( 0, 4 ) ) - 1900
+    };
 
     setenv( "TZ", "UTC", 1 );
     tzset();