mini cleanup

arangod/RestServer/ConsoleThread.cpp

@@ -61,7 +61,7 @@ ConsoleThread::ConsoleThread (ApplicationServer* applicationServer,
   : Thread("console"),
     _applicationServer(applicationServer),
     _applicationV8(applicationV8),
-    _context(0),
+    _context(nullptr),
     _vocbase(vocbase),
     _done(0),
     _userAborted(false) {
@@ -151,13 +151,13 @@ void ConsoleThread::inner () {
     char* input = console.prompt("arangod> ");
 
     if (_userAborted) {
-      if (input != 0) {
+      if (input != nullptr) {
         TRI_FreeString(TRI_UNKNOWN_MEM_ZONE, input);
       }
       throw "user aborted";
     }
 
-    if (input == 0) {
+    if (input == nullptr) {
       _userAborted = true;
 
       // this will be caught by "run"

lib/Basics/Thread.cpp

@@ -111,25 +111,29 @@ Thread::Thread (std::string const& name)
 ////////////////////////////////////////////////////////////////////////////////
 
 Thread::~Thread () {
-  int res;
-
   if (_running != 0) {
     if (! isSilent()) {
       LOG_WARNING("forcefully shutting down thread '%s'", _name.c_str());
     }
 
-    res = TRI_StopThread(&_thread);
+    int res = TRI_StopThread(&_thread);
 
     if (res != TRI_ERROR_NO_ERROR) {
-      LOG_WARNING("unable to stop thread '%s': %s", _name.c_str(), TRI_errno_string(res));
+      errno = res;
+      TRI_set_errno(TRI_ERROR_SYS_ERROR);
+      
+      LOG_WARNING("unable to stop thread '%s': %s", _name.c_str(), TRI_last_error());
     }
   }
 
   if (! _joined) {
-    res = TRI_DetachThread(&_thread);
+    int res = TRI_DetachThread(&_thread);
 
     if (res != TRI_ERROR_NO_ERROR) {
-      LOG_WARNING("unable to detach thread '%s': %s", _name.c_str(), TRI_errno_string(res));
+      errno = res;
+      TRI_set_errno(TRI_ERROR_SYS_ERROR);
+
+      LOG_WARNING("unable to detach thread '%s': %s", _name.c_str(), TRI_last_error());
     }
   }
 }
@@ -236,9 +240,12 @@ int Thread::shutdown () {
     int res = TRI_StopThread(&_thread);
 
     if (res != TRI_ERROR_NO_ERROR) {
+      errno = res;
+      TRI_set_errno(TRI_ERROR_SYS_ERROR);
+
       LOG_WARNING("unable to stop thread '%s': %s",
                   _name.c_str(),
-                  TRI_errno_string(res));
+                  TRI_last_error());
     }
   }
 

lib/Utilities/LineEditor.cpp

@@ -142,7 +142,6 @@ void LineEditor::sortAlternatives (vector<string>& completions) {
 void LineEditor::prepareShell () {
   if (! _shellImpl) {
     initializeShell();
-  //  assert _shellImpl != 0;
   }
 }
 // -----------------------------------------------------------------------------

lib/Utilities/ReadlineShell.cpp

@@ -46,7 +46,6 @@ using namespace std;
 using namespace triagens;
 
 namespace {
-
   Completer* COMPLETER;
 
   static char WordBreakCharacters[] = {
@@ -74,7 +73,6 @@ namespace {
     }
   }
 
-
   static char** AttemptedCompletion (char const* text, int start, int end) {
     char** result;
 
@@ -110,7 +108,8 @@ namespace {
 /// @brief constructs a new editor
 ////////////////////////////////////////////////////////////////////////////////
 
-ReadlineShell::ReadlineShell(std::string const& history, Completer *completer)
+ReadlineShell::ReadlineShell (std::string const& history, 
+                              Completer* completer)
   : ShellImplementation(history, completer) {
 
   COMPLETER = completer;
@@ -136,7 +135,6 @@ ReadlineShell::ReadlineShell(std::string const& history, Completer *completer)
 
 bool ReadlineShell::open (bool autoComplete) {
   if (autoComplete) {
-
     // issue #289: do not append a space after completion
     rl_completion_append_character = '\0';
 
@@ -168,7 +166,6 @@ bool ReadlineShell::open(bool autoComplete) {
   stifle_history(1000);
 
   _state = STATE_OPENED;
-
   return read_history(historyPath().c_str()) == 0;
 }
 
@@ -261,6 +258,7 @@ bool ReadlineShell::writeHistory() {
 char * ReadlineShell::getLine (char const * input) {
   return readline(input);
 }
+
 // -----------------------------------------------------------------------------
 // --SECTION--                                                       END-OF-FILE
 // -----------------------------------------------------------------------------