commit 74800615b588c64c60160399d5007e5a439bfb26
author Greg Clayton <gclayton@apple.com> Tue Feb 01 05:15:22 2011 +0000
committer Greg Clayton <gclayton@apple.com> Tue Feb 01 05:15:22 2011 +0000
tree 8d7a6fff0a7a8d7a7b592580efd4c0791106614d
parent ad400274d4e3ed01a4c730e1d6f95e6cb2ac73dc

Added a cleanup helper object to make sure the directory that was opened with "DIR *opendir(const char *)" is closed if it is valid with a call to "int closedir (DIR *)".

git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@124649 91177308-0d34-0410-b5e6-96231b3b80d8

source/Commands/CommandCompletions.cpp

diff --git a/source/Commands/CommandCompletions.cpp b/source/Commands/CommandCompletions.cpp
index 3102f55..d44d668 100644
--- a/source/Commands/CommandCompletions.cpp
+++ b/source/Commands/CommandCompletions.cpp
@@ -19,13 +19,13 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include "lldb/Interpreter/Args.h"
-#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Core/FileSpecList.h"
-#include "lldb/Target/Target.h"
-#include "lldb/Interpreter/CommandCompletions.h"
 #include "lldb/Core/FileSpec.h"
-
+#include "lldb/Core/FileSpecList.h"
+#include "lldb/Interpreter/Args.h"
+#include "lldb/Interpreter/CommandCompletions.h"
+#include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Utility/CleanUp.h"
 
 using namespace lldb_private;
 
@@ -246,18 +246,16 @@
     }
     
     // Okay, containing_part is now the directory we want to open and look for files:
-    
-    DIR *dir_stream;
-    
-    dir_stream = opendir(containing_part);
-    if (dir_stream == NULL)
+
+    lldb_utility::CleanUp <DIR *, int> dir_stream (opendir(containing_part), NULL, closedir);
+    if (!dir_stream.is_valid())
         return matches.GetSize();
-        
+    
     struct dirent *dirent_buf;
     
     size_t baselen = end_ptr - partial_name_copy;
     
-    while ((dirent_buf = readdir(dir_stream)) != NULL) 
+    while ((dirent_buf = readdir(dir_stream.get())) != NULL) 
     {
         char *name = dirent_buf->d_name;