Openbsd: output error message on error

openbsd/cpu.cc

@@ -30,9 +30,9 @@ uint8_t get_cpu_count()
   int mib[2] = { CTL_HW, HW_NCPU };
   size_t len = sizeof( cpu_count );
 
-  if(sysctl(mib, 2, &cpu_count, &len, NULL, 0) < 0)
+  if( sysctl( mib, 2, &cpu_count, &len, NULL, 0 ) < 0 )
   {
-    error("sysctl: error getting cpu count");
+    error( "sysctl: error getting cpu count" );
   }
 
   return cpu_count;
@@ -48,17 +48,17 @@ float cpu_percentage( unsigned int cpu_usage_delay )
   size_t size = sizeof( load1 );
 
   // get cpu times
-  if(sysctl(cpu_ctl, 2, &load1, &size, NULL, 0) < 0)
+  if( sysctl( cpu_ctl, 2, &load1, &size, NULL, 0 ) < 0 )
   {
-    error("sysctl: error getting initial cpu stats");
+    error( "sysctl: error getting initial cpu stats" );
   }
 
-  usleep(cpu_usage_delay);
+  usleep( cpu_usage_delay );
 
   // update cpu times
-  if(sysctl(cpu_ctl, 2, &load2, &size, NULL, 0) < 0)
+  if( sysctl( cpu_ctl, 2, &load2, &size, NULL, 0 ) < 0 )
   {
-    error("sysctl: error getting updated cpu stats");
+    error( "sysctl: error getting updated cpu stats" );
   }
 
   // Current load times
@@ -77,7 +77,7 @@ float cpu_percentage( unsigned int cpu_usage_delay )
   unsigned long long diff_nice = next_nice - current_nice;
   unsigned long long diff_idle = next_idle - current_idle;
 
-  return static_cast<float>(diff_user + diff_system + diff_nice) /
-    static_cast<float>(diff_user + diff_system + diff_nice + diff_idle) *
+  return static_cast<float>( diff_user + diff_system + diff_nice ) /
+    static_cast<float>( diff_user + diff_system + diff_nice + diff_idle ) *
     100.0;
 }

openbsd/error.cc

@@ -1,70 +0,0 @@
-/* vim: tabstop=2 shiftwidth=2 expandtab textwidth=80 linebreak wrap
- *
- * Copyright 2012 Matthew McCormick
- * Copyright 2015 Pawel 'l0ner' Soltys
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <iostream>
-#include <sys/errno.h>
-#include <cerrno>
-
-#include "error.h"
-
-void error( const char * error )
-{
-  using std::cerr;
-  using std::endl;
-
-  cerr << error;
-  
-  switch( errno )
-  {
-    case EFAULT:
-      cerr << "Bad address";
-      break;
-    case EINVAL:
-      cerr << "Invalid argument";
-      break;
-    case ENOMEM:
-      cerr << "Cannot allocate memory";
-      break;
-    case ENOENT:
-      cerr << "No such file or directory";
-      break;
-    case ENXIO:
-      cerr << "Device not configured";
-      break;
-    case ENOTDIR:
-      cerr << "Not a directory";
-      break;
-    case EOPNOTSUPP:
-      cerr << "Operation not supported";
-      break;
-    case EPERM:
-      cerr << "Operation not permitted";
-      break;
-    case ESRCH:
-      cerr << "No such process";
-      break;
-    default:
-      cerr << "Unknown error code: " << errno;
-      break;
-  }
-  
-  cerr << endl;
-
-  exit( 23 );
-}
-

openbsd/error.h

@@ -20,10 +20,17 @@
 #define BSD_ERROR_H_
 
 #include <iostream>
+#include <sys/errno.h>
+#include <cerrno>
+#include <cstring> // strerror
 
-inline void error(const char * error) {
-  std::cerr << error << std::endl;
-  exit(23);
+inline void error( const char * error )
+{
+  using std::cerr;
+  using std::endl;
+
+  cerr << error << ": " << strerror( errno ) << endl;
+  exit( 23 );
 }
 
 #endif

openbsd/memory.cc

@@ -59,10 +59,9 @@ std::string mem_string( bool use_colors = false )
   static int hw_pagesize[] = { CTL_HW, HW_PAGESIZE };
   int page_size = 0;
   size = sizeof( page_size );
-  if( sysctl( hw_pagesize, 2, &page_size, &size, NULL, 0) < 0)
+  if( sysctl( hw_pagesize, 2, &page_size, &size, NULL, 0 ) < 0 )
   {
-    error("memory: error getting page size");
-    exit(23);
+    error( "memory: error getting page size" );
   }
 
   // calculate how far we must shift the variables
@@ -79,8 +78,7 @@ std::string mem_string( bool use_colors = false )
   size = sizeof( vm_total );
   if( sysctl( vm_totalmem, 2, &vm_total, &size, NULL, 0 ) < 0 )
   {
-    error("memory: error getting vm memory stats");
-    exit(23);
+    error( "memory: error getting vm memory stats" );
   }
 
   // In case we need it, this gets the cached memory (bcstats.numbufpages)
@@ -90,7 +88,6 @@ std::string mem_string( bool use_colors = false )
   if( sysctl( vm_bcstats, 3, &bcstats, &size, NULL, 0 ) < 0 )
   {
     error( "memory: error getting cached memory size" );
-    exit( 23 );
   }
 
   // calculations based on conky openbsd port