From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 19 Oct 2015 14:17:10 +0000 (-0700)
Subject: [master] Do not use temporary variables to bind to PostgreSQL queries.
X-Git-Tag: trac4071_base~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a7186233ee68408988c209a4733c8ba77e16ea2;p=thirdparty%2Fkea.git

[master] Do not use temporary variables to bind to PostgreSQL queries.

This change has been reviewed and approved on jabber.
---

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
index 3e3381ea5b..f655fcaf55 100644
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@ -1470,16 +1470,19 @@ PgSqlLeaseMgr::getExpiredLeasesCommon(LeaseCollection& expired_leases,
     PsqlBindArray bind_array;
 
     // Exclude reclaimed leases.
-    bind_array.add(boost::lexical_cast<std::string>(Lease::STATE_EXPIRED_RECLAIMED));
+    std::string state_str = boost::lexical_cast<std::string>(Lease::STATE_EXPIRED_RECLAIMED);
+    bind_array.add(state_str);
 
     // Expiration timestamp.
-    bind_array.add(PgSqlLeaseExchange::convertToDatabaseTime(time(NULL)));
+    std::string timestamp_str = PgSqlLeaseExchange::convertToDatabaseTime(time(NULL));
+    bind_array.add(timestamp_str);
 
     // If the number of leases is 0, we will return all leases. This is
     // achieved by setting the limit to a very high value.
     uint32_t limit = max_leases > 0 ? static_cast<uint32_t>(max_leases) :
         std::numeric_limits<uint32_t>::max();
-    bind_array.add(boost::lexical_cast<std::string>(limit));
+    std::string limit_str = boost::lexical_cast<std::string>(limit);
+    bind_array.add(limit_str);
 
     // Retrieve leases from the database.
     getLeaseCollection(statement_index, bind_array, expired_leases);