s3select:clang-tidying of s3select_oper.h

... and some undoing of formatting changes

(and rebasing...)

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Author: ronen-fr

include/s3select.h

@@ -15,7 +15,6 @@
 #include <boost/bind.hpp>
 #include <functional>
 
-using namespace std::string_literals;
 
 #define _DEBUG_TERM {string  token(a,b);std::cout << __FUNCTION__ << token << std::endl;}
 
@@ -932,7 +931,7 @@ void push_negation::builder(s3select* self, const char* a, const char* b) const
   //upon NOT operator, the logical and arithmetical operators are "tagged" to negate result.
   if (dynamic_cast<logical_operand*>(pred))
   {
-    logical_operand* f = S3SELECT_NEW(self, logical_operand, pred); // todo: marked as "empty statemant"
+    logical_operand* f = S3SELECT_NEW(self, logical_operand, pred);
     self->getAction()->condQ.push_back(f);
   }
   else if (dynamic_cast<__function*>(pred) || dynamic_cast<negate_function_operation*>(pred))

include/s3select_functions.h

@@ -8,9 +8,6 @@
 #include <regex>
 using namespace std::string_literals;
 
-
-using namespace std::string_literals;
-
 #define BOOST_BIND_ACTION_PARAM( push_name ,param ) boost::bind( &push_name::operator(), g_ ## push_name , _1 ,_2, param)
 namespace s3selectEngine
 {
@@ -446,13 +443,13 @@ struct _fn_to_int : public base_function
       if ((errno == ERANGE && (i == LONG_MAX || i == LONG_MIN)) || (errno != 0 && i == 0)) {
         throw base_s3select_exception("converted value would fall out of the range of the result type!");
         return false;   
-    }
+      }
 
-    if (*perr != '\0') {
-      throw base_s3select_exception("characters after int!");
-      return false;
+      if (*perr != '\0') {
+        throw base_s3select_exception("characters after int!");
+        return false;
+      }
     }
-  } 
     else if (func_arg.type == value::value_En_t::FLOAT)
     {
       i = func_arg.dbl();
@@ -476,7 +473,6 @@ struct _fn_to_float : public base_function
 
   bool operator()(bs_stmt_vec_t* args, variable* result) override
   {
-    char* perr;
     value v = (*args->begin())->eval();
 
     switch (v.type) {
@@ -497,8 +493,8 @@ struct _fn_to_float : public base_function
       }
 
       var_result = d;
-      break;
     }
+    break;
 
     case value::value_En_t::FLOAT:
       var_result = v.dbl();
@@ -595,7 +591,7 @@ struct _fn_to_timestamp : public base_function
 
     bsc::parse_info<> info_dig = bsc::parse(v_str.str(), d_yyyymmdd_dig >> *(separator) >> d_time_dig);
 
-    if(!datetime_validation() or !info_dig.full)
+    if(!datetime_validation() || !info_dig.full)
     {
       throw base_s3select_exception("input date-time is illegal");
     }