cleanups

Author: ahiguti

handlersocket/database.cpp

@@ -588,10 +588,7 @@ dbcontext::modify_record(dbcallback_i& cb, TABLE *const table,
 	continue;
       }
       const long long pval = fld->val_int();
-      char buf[nv.size() + 1];
-      memcpy(buf, nv.begin(), nv.size());
-      buf[nv.size()] = 0;
-      const long long llv = atoll(buf);
+      const long long llv = atoll_nocheck(nv.begin(), nv.end());
       long long nval = 0;
       if (mod_op == '+') {
 	/* increment */

libhsclient/string_util.cpp

@@ -41,12 +41,46 @@ atoi_tmpl_nocheck(const char *start, const char *finish)
   return v;
 }
 
+template <typename T> T
+atoi_signed_tmpl_nocheck(const char *start, const char *finish)
+{
+  T v = 0;
+  bool negative = false;
+  if (start != finish) {
+    if (start[0] == '-') {
+      ++start;
+      negative = true;
+    } else if (start[0] == '+') {
+      ++start;
+    }
+  }
+  for (; start != finish; ++start) {
+    const char c = *start;
+    if (c < '0' || c > '9') {
+      break;
+    }
+    v *= 10;
+    if (negative) {
+      v -= static_cast<T>(c - '0');
+    } else {
+      v += static_cast<T>(c - '0');
+    }
+  }
+  return v;
+}
+
 uint32_t
 atoi_uint32_nocheck(const char *start, const char *finish)
 {
   return atoi_tmpl_nocheck<uint32_t>(start, finish);
 }
 
+long long
+atoll_nocheck(const char *start, const char *finish)
+{
+  return atoi_signed_tmpl_nocheck<long long>(start, finish);
+}
+
 void
 append_uint32(string_buffer& buf, uint32_t v)
 {

libhsclient/string_util.hpp

@@ -34,6 +34,7 @@ string_wref get_token(char *& wp, char *wp_end, char delim);
 uint32_t atoi_uint32_nocheck(const char *start, const char *finish);
 std::string to_stdstring(uint32_t v);
 void append_uint32(string_buffer& buf, uint32_t v);
+long long atoll_nocheck(const char *start, const char *finish);
 
 int errno_string(const char *s, int en, std::string& err_r);
 

regtest/test_01_lib/test11.expected

@@ -24,14 +24,14 @@ VAL
 [0][k7][-84]
 [0][k8][0]
 INCREMENT
-[0][1]
-[0][1]
-[0][1]
-[0][1]
-[0][1]
-[0][1]
-[0][1]
-[0][1]
-[0][1]
+[0][6]
+[0][7]
+[0][8]
+[0][9]
+[0][10]
+[0][11]
+[0][12]
+[0][13]
+[0][14]
 VAL
 [0][k5][15]