From 59f8144c50765189594d5932fc25869f9ea6e265 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 19 Oct 2013 18:19:03 +0200
Subject: *: use nullptr instead of NULL
---
src/archive/Bzip2ArchivePlugin.cxx | 4 ++--
src/archive/Iso9660ArchivePlugin.cxx | 6 +++---
src/archive/ZzipArchivePlugin.cxx | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'src/archive')
diff --git a/src/archive/Bzip2ArchivePlugin.cxx b/src/archive/Bzip2ArchivePlugin.cxx
index 61e31a671..6c5bba8be 100644
--- a/src/archive/Bzip2ArchivePlugin.cxx
+++ b/src/archive/Bzip2ArchivePlugin.cxx
@@ -185,7 +185,7 @@ Bzip2ArchiveFile::OpenStream(const char *path,
Bzip2InputStream *bis = new Bzip2InputStream(*this, path, mutex, cond);
if (!bis->Open(error)) {
delete bis;
- return NULL;
+ return nullptr;
}
return &bis->base;
@@ -273,7 +273,7 @@ bz2_is_eof(struct input_stream *is)
static const char *const bz2_extensions[] = {
"bz2",
- NULL
+ nullptr
};
const InputPlugin bz2_inputplugin = {
diff --git a/src/archive/Iso9660ArchivePlugin.cxx b/src/archive/Iso9660ArchivePlugin.cxx
index 4359256e5..1cfac3a43 100644
--- a/src/archive/Iso9660ArchivePlugin.cxx
+++ b/src/archive/Iso9660ArchivePlugin.cxx
@@ -118,7 +118,7 @@ iso9660_archive_open(const char *pathname, Error &error)
if (iso == nullptr) {
error.Format(iso9660_domain,
"Failed to open ISO9660 file %s", pathname);
- return NULL;
+ return nullptr;
}
return new Iso9660ArchiveFile(iso);
@@ -168,7 +168,7 @@ Iso9660ArchiveFile::OpenStream(const char *pathname,
if (statbuf == nullptr) {
error.Format(iso9660_domain,
"not found in the ISO file: %s", pathname);
- return NULL;
+ return nullptr;
}
Iso9660InputStream *iis =
@@ -236,7 +236,7 @@ iso9660_input_eof(struct input_stream *is)
static const char *const iso9660_archive_extensions[] = {
"iso",
- NULL
+ nullptr
};
const InputPlugin iso9660_input_plugin = {
diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/ZzipArchivePlugin.cxx
index 35730d078..436afc417 100644
--- a/src/archive/ZzipArchivePlugin.cxx
+++ b/src/archive/ZzipArchivePlugin.cxx
@@ -75,11 +75,11 @@ static constexpr Domain zzip_domain("zzip");
static ArchiveFile *
zzip_archive_open(const char *pathname, Error &error)
{
- ZZIP_DIR *dir = zzip_dir_open(pathname, NULL);
+ ZZIP_DIR *dir = zzip_dir_open(pathname, nullptr);
if (dir == nullptr) {
error.Format(zzip_domain, "Failed to open ZIP file %s",
pathname);
- return NULL;
+ return nullptr;
}
return new ZzipArchiveFile(dir);
@@ -137,7 +137,7 @@ ZzipArchiveFile::OpenStream(const char *pathname,
if (_file == nullptr) {
error.Format(zzip_domain, "not found in the ZIP file: %s",
pathname);
- return NULL;
+ return nullptr;
}
ZzipInputStream *zis =
@@ -199,7 +199,7 @@ zzip_input_seek(struct input_stream *is, InputPlugin::offset_type offset,
static const char *const zzip_archive_extensions[] = {
"zip",
- NULL
+ nullptr
};
const InputPlugin zzip_input_plugin = {
--
cgit v1.2.3