Small fixes

Author: gansm

build.sh

@@ -16,7 +16,8 @@ cd "$SRCDIR" || exit
 print_systeminfo ()
 {
   test -z "$CXX" && eval "$(grep '^CXX = ' "Makefile" | cut -d' ' -f1-3 | sed -e 's/ //g')"
-  local cxx_version="$($CXX -dumpfullversion -dumpversion || echo "unknown version")"
+  cxx_version="$($CXX -dumpfullversion -dumpversion || echo "unknown version")"
+  local cxx_version
   local build_mode="$1"
   echo "-------------------------"
   echo "      Platform: $PLATFORM"

examples/ui.cpp

@@ -1052,11 +1052,10 @@ void MyDialog::cb_view (const finalcut::FMenuItem* item)
   view->setResizeable();
   std::string line{};
   std::ifstream infile;
-  infile.open(file.c_str());
+  infile.open(file.c_str(), std::ios::in);
 
-  while ( ! infile.eof() && infile.good() )
+  while ( std::getline(infile, line) )
   {
-    getline(infile, line);
     view->append(line);
   }
 

examples/xpmimage.h

@@ -1167,9 +1167,8 @@ auto XpmImage::xpmFileToVector (const std::string& filename) const -> std::vecto
   std::regex regex(R"gx("(.*)")gx");
   std::size_t num{0};
 
-  while ( ! infile.eof() && infile.good() )
+  while ( std::getline(infile, line) )
   {
-    getline(infile, line);
     std::smatch match;
 
     if ( (num == 0 && line.find("/* XPM */") == std::string::npos)

final/eventloop/eventloop.cpp

@@ -131,13 +131,11 @@ inline auto EventLoop::processNextEvents() -> bool
 //----------------------------------------------------------------------
 auto EventLoop::processPoll (int& num_of_events) -> PollResult
 {
-  int poll_result{};
-
   while (true)
   {
-    poll_result = poll( cached_fds.data()
-                      , cached_fds.size()
-                      , WAIT_INDEFINITELY );
+    int poll_result = poll( cached_fds.data()
+                          , cached_fds.size()
+                          , WAIT_INDEFINITELY );
 
     if ( poll_result > 0 )
     {

final/util/fstring.cpp

@@ -436,9 +436,7 @@ auto FString::toLong() const -> long
     throw std::invalid_argument ("no valid number");
 
   long num{0};
-  constexpr long pos_limit = LONG_MAX / 10;
-  constexpr long neg_limit = -(LONG_MIN / 10);
-  const long limit = neg ? neg_limit : pos_limit;
+  constexpr long limit = LONG_MAX / 10;
   const long limit_digit = neg ? (-(LONG_MIN % 10) + 1) : (LONG_MAX % 10);
 
   while ( s_ptr != end )

scripts/cpuprofile.sh

@@ -5,13 +5,13 @@ EXECUTABLE_FILE="../examples/.libs/ui"
 error_handling ()
 {
   echo "No ELF executable!"
-  exit 1
+  return 1
 }
 
 if [ $# -gt 0 ]
 then
   EXECUTABLE_FILE="$1"
-  file --brief "$EXECUTABLE_FILE" | grep -q "ELF" || error_handling
+  file --brief "$EXECUTABLE_FILE" | grep -q "ELF" || error_handling || exit 1
   LD_LIBRARY_PATH=../final/.libs/ LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libprofiler.so.0" CPUPROFILE=profile.prof "$@"
 else
   LD_LIBRARY_PATH=../final/.libs/ LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libprofiler.so.0" CPUPROFILE=profile.prof "$EXECUTABLE_FILE"

test/flogger-test.cpp

@@ -303,9 +303,8 @@ void FLoggerTest::fileTest()
   std::ifstream file_stream{filename};
   std::size_t i{0};
 
-  while ( ! file_stream.eof() && file_stream.good() )
-  {
-    getline(file_stream, line);
+  while ( std::getline(file_stream, line) )
+  {  
     CPPUNIT_ASSERT ( line == strings[i] );
     i++;
   }

test/fstringstream-test.cpp

@@ -205,11 +205,10 @@ void FStringStreamTest::fileTest()
   }
 
   std::ifstream file_stream{filename};
+  std::string line{};
 
-  if ( ! file_stream.eof() && file_stream.good() )
+  if ( std::getline(file_stream, line) )
   {
-    std::string line{};
-    getline(file_stream, line);
     CPPUNIT_ASSERT ( line == "FStringStream file test" );
   }