summaryrefslogtreecommitdiffstats
path: root/src/io/gzipstream.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 10:46:15 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commitf4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch)
tree7c6044fd3a17a2665841959dac9b3b2110b27924 /src/io/gzipstream.cpp
parentRun clang-tidy’s modernize-use-override pass. (diff)
downloadinkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.tar.gz
inkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.zip
Run clang-tidy’s modernize-use-nullptr pass.
This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer.
Diffstat (limited to 'src/io/gzipstream.cpp')
-rw-r--r--src/io/gzipstream.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp
index 330191ecd..dfb605f14 100644
--- a/src/io/gzipstream.cpp
+++ b/src/io/gzipstream.cpp
@@ -51,8 +51,8 @@ GzipInputStream::GzipInputStream(InputStream &sourceStream)
loaded(false),
totalIn(0),
totalOut(0),
- outputBuf(NULL),
- srcBuf(NULL),
+ outputBuf(nullptr),
+ srcBuf(nullptr),
crc(0),
srcCrc(0),
srcSiz(0),
@@ -72,11 +72,11 @@ GzipInputStream::~GzipInputStream()
close();
if ( srcBuf ) {
delete[] srcBuf;
- srcBuf = NULL;
+ srcBuf = nullptr;
}
if ( outputBuf ) {
delete[] outputBuf;
- outputBuf = NULL;
+ outputBuf = nullptr;
}
}
@@ -109,11 +109,11 @@ void GzipInputStream::close()
if ( srcBuf ) {
delete[] srcBuf;
- srcBuf = NULL;
+ srcBuf = nullptr;
}
if ( outputBuf ) {
delete[] outputBuf;
- outputBuf = NULL;
+ outputBuf = nullptr;
}
closed = true;
}
@@ -179,7 +179,7 @@ bool GzipInputStream::load()
outputBuf = new (std::nothrow) unsigned char [OUT_SIZE];
if ( !outputBuf ) {
delete[] srcBuf;
- srcBuf = NULL;
+ srcBuf = nullptr;
return false;
}
outputBufLen = 0; // Not filled in yet
@@ -251,9 +251,9 @@ bool GzipInputStream::load()
unsigned long dataLen = srcLen - (headerLen + 8);
//printf("%x %x\n", data[0], data[dataLen-1]);
- d_stream.zalloc = (alloc_func)0;
- d_stream.zfree = (free_func)0;
- d_stream.opaque = (voidpf)0;
+ d_stream.zalloc = (alloc_func)nullptr;
+ d_stream.zfree = (free_func)nullptr;
+ d_stream.opaque = (voidpf)nullptr;
d_stream.next_in = data;
d_stream.avail_in = dataLen;
d_stream.next_out = outputBuf;