summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util/zippath.cpp
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-06-25 03:00:31 +1000
committer Vas Crabb <vas@vastheman.com>2016-06-25 03:35:23 +1000
commit5cee9e9bc4fe03dc561d3a7a87ecadcf89743e2b (patch)
tree84c962bcfb8f0fdfd73d6b4e317f140034958ce3 /src/lib/util/zippath.cpp
parent20a95045e16ab69cfb13c6d3cf520e63aa553102 (diff)
POSIX implementation for new directory read features, cleanup of Windows implementation, return directory handle as smart pointer, fix full build [Vas Crabb]
Diffstat (limited to 'src/lib/util/zippath.cpp')
-rw-r--r--src/lib/util/zippath.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp
index 48a919a8cad..3322c1152cc 100644
--- a/src/lib/util/zippath.cpp
+++ b/src/lib/util/zippath.cpp
@@ -37,9 +37,9 @@ class zippath_directory
public:
zippath_directory()
: returned_parent(false)
- , directory(nullptr)
+ , directory()
, called_zip_first(false)
- , zipfile(nullptr)
+ , zipfile()
, returned_dirlist()
{
}
@@ -52,7 +52,7 @@ public:
/* specific to normal directories */
/** @brief Pathname of the directory. */
- osd::directory *directory;
+ osd::directory::ptr directory;
/* specific to ZIP directories */
/** @brief true to called zip first. */
@@ -840,7 +840,7 @@ done:
void zippath_closedir(zippath_directory *directory)
{
if (directory->directory != nullptr)
- delete directory->directory;
+ directory->directory.reset();
if (directory->zipfile != nullptr)
directory->zipfile.reset();