Openbsd: output error message on error

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,9 +20,16 @@
 #define BSD_ERROR_H_
 
 #include <iostream>
+#include <sys/errno.h>
+#include <cerrno>
+#include <cstring> // strerror
 
-inline void error(const char * error) {
+inline void error( const char * error )
-  std::cerr << error << std::endl;
+{
+  using std::cerr;
+  using std::endl;
+
+  cerr << error << ": " << strerror( errno ) << endl;
   exit( 23 );
 }
 

openbsd/memory.cc

@@ -62,7 +62,6 @@ std::string mem_string( bool use_colors = false )
   if( sysctl( hw_pagesize, 2, &page_size, &size, NULL, 0 ) < 0 )
   {
     error( "memory: error getting page size" );
-    exit(23);
   }
 
   // calculate how far we must shift the variables
@@ -80,7 +79,6 @@ std::string mem_string( bool use_colors = false )
   if( sysctl( vm_totalmem, 2, &vm_total, &size, NULL, 0 ) < 0 )
   {
     error( "memory: error getting vm memory stats" );
-    exit(23);
   }
 
   // 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