kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[libE57] remove superfluous nullptr checks

Browse Source
This commit is contained in:
Uwe
2022-07-18 02:59:14 +02:00
parent 7b4e014263
commit b801e7151a
16 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdParty/libE57Format/src/BlobNodeImpl.cpp vendored
View File

@@ -184,7 +184,7 @@ namespace e57
// don't checkImageFileOpen
ustring fieldName;
if ( forcedFieldName != nullptr )
if ( forcedFieldName )
{
fieldName = forcedFieldName;
}

6
src/3rdParty/libE57Format/src/CheckedFile.cpp vendored
View File

@@ -455,7 +455,7 @@ void CheckedFile::seek( uint64_t offset, OffsetMode omode )
uint64_t CheckedFile::lseek64( int64_t offset, int whence )
{
if ( ( fd_ < 0 ) && ( bufView_ != nullptr ) )
if ( ( fd_ < 0 ) && bufView_ )
{
const auto uoffset = static_cast<uint64_t>( offset );
@@ -652,7 +652,7 @@ void CheckedFile::close()
fd_ = -1;
}
if ( bufView_ != nullptr )
if ( bufView_ )
{
delete bufView_;
bufView_ = nullptr;
@@ -746,7 +746,7 @@ void CheckedFile::readPhysicalPage( char *page_buffer, uint64_t page )
/// Seek to start of physical page
seek( page * physicalPageSize, Physical );
if ( ( fd_ < 0 ) && ( bufView_ != nullptr ) )
if ( ( fd_ < 0 ) && bufView_ )
{
bufView_->read( page_buffer, physicalPageSize );
return;

2
src/3rdParty/libE57Format/src/CompressedVectorNodeImpl.cpp vendored
View File

@@ -202,7 +202,7 @@ namespace e57
// don't checkImageFileOpen
ustring fieldName;
if ( forcedFieldName != nullptr )
if ( forcedFieldName )
{
fieldName = forcedFieldName;
}

2
src/3rdParty/libE57Format/src/Decoder.cpp vendored
View File

@@ -220,7 +220,7 @@ size_t BitpackDecoder::inputProcess( const char *source, const size_t availableB
size_t byteCount = std::min( bytesUnsaved, inBuffer_.size() - static_cast<size_t>( inBufferEndByte_ ) );
/// Copy input bytes from caller, if any
if ( ( byteCount > 0 ) && ( source != nullptr ) )
if ( ( byteCount > 0 ) && source )
{
memcpy( &inBuffer_[inBufferEndByte_], source, byteCount );

4
src/3rdParty/libE57Format/src/E57Exception.cpp vendored
View File

@@ -143,14 +143,14 @@ namespace e57
os << " Debug info: " << std::endl;
os << " context: " << context_ << std::endl;
os << " sourceFunctionName: " << sourceFunctionName_ << std::endl;
if ( reportingFunctionName != nullptr )
if ( reportingFunctionName )
os << " reportingFunctionName: " << reportingFunctionName << std::endl;
/*** Add a line in error message that a smart editor (gnu emacs) can
* interpret as a link to the source code: */
os << sourceFileName_ << "(" << sourceLineNumber_ << ") : error C" << errorCode_ << ": <--- occurred on"
<< std::endl;
if ( reportingFileName != nullptr )
if ( reportingFileName )
os << reportingFileName << "(" << reportingLineNumber << ") : error C0: <--- reported on" << std::endl;
#endif
}

2
src/3rdParty/libE57Format/src/E57XmlParser.cpp vendored
View File

@@ -252,7 +252,7 @@ void E57XmlParser::init()
xmlReader = XMLReaderFactory::createXMLReader(); //??? auto_ptr?
if ( xmlReader == nullptr )
if ( !xmlReader )
{
throw E57_EXCEPTION2( E57_ERROR_XML_PARSER_INIT, "could not create the xml reader" );
}

2
src/3rdParty/libE57Format/src/FloatNodeImpl.cpp vendored
View File

@@ -149,7 +149,7 @@ namespace e57
// don't checkImageFileOpen
ustring fieldName;
if ( forcedFieldName != nullptr )
if ( forcedFieldName )
{
fieldName = forcedFieldName;
}

4
src/3rdParty/libE57Format/src/ImageFileImpl.cpp vendored
View File

@@ -290,7 +290,7 @@ namespace e57
void ImageFileImpl::close()
{
/// If file already closed, have nothing to do
if ( file_ == nullptr )
if ( !file_ )
{
return;
}
@@ -349,7 +349,7 @@ namespace e57
void ImageFileImpl::cancel()
{
/// If file already closed, have nothing to do
if ( file_ == nullptr )
if ( !file_ )
{
return;
}

2
src/3rdParty/libE57Format/src/IntegerNodeImpl.cpp vendored
View File

@@ -120,7 +120,7 @@ namespace e57
// don't checkImageFileOpen
ustring fieldName;
if ( forcedFieldName != nullptr )
if ( forcedFieldName )
{
fieldName = forcedFieldName;
}

46
src/3rdParty/libE57Format/src/ReaderImpl.cpp vendored
View File

@@ -1303,117 +1303,117 @@ namespace e57
bool haveNormalsExt = imf_.extensionsLookupPrefix( "nor", norExtUri );
if ( ( name.compare( "cartesianX" ) == 0 ) && proto.isDefined( "cartesianX" ) &&
( buffers.cartesianX != nullptr ) )
buffers.cartesianX )
{
destBuffers.emplace_back( imf_, "cartesianX", buffers.cartesianX, count, true, scaled );
}
else if ( ( name.compare( "cartesianY" ) == 0 ) && proto.isDefined( "cartesianY" ) &&
( buffers.cartesianY != nullptr ) )
buffers.cartesianY )
{
destBuffers.emplace_back( imf_, "cartesianY", buffers.cartesianY, count, true, scaled );
}
else if ( ( name.compare( "cartesianZ" ) == 0 ) && proto.isDefined( "cartesianZ" ) &&
( buffers.cartesianZ != nullptr ) )
buffers.cartesianZ )
{
destBuffers.emplace_back( imf_, "cartesianZ", buffers.cartesianZ, count, true, scaled );
}
else if ( ( name.compare( "cartesianInvalidState" ) == 0 ) && proto.isDefined( "cartesianInvalidState" ) &&
( buffers.cartesianInvalidState != nullptr ) )
buffers.cartesianInvalidState )
{
destBuffers.emplace_back( imf_, "cartesianInvalidState", buffers.cartesianInvalidState, count, true );
}
else if ( ( name.compare( "sphericalRange" ) == 0 ) && proto.isDefined( "sphericalRange" ) &&
( buffers.sphericalRange != nullptr ) )
buffers.sphericalRange )
{
destBuffers.emplace_back( imf_, "sphericalRange", buffers.sphericalRange, count, true, scaled );
}
else if ( ( name.compare( "sphericalAzimuth" ) == 0 ) && proto.isDefined( "sphericalAzimuth" ) &&
( buffers.sphericalAzimuth != nullptr ) )
buffers.sphericalAzimuth )
{
destBuffers.emplace_back( imf_, "sphericalAzimuth", buffers.sphericalAzimuth, count, true, scaled );
}
else if ( ( name.compare( "sphericalElevation" ) == 0 ) && proto.isDefined( "sphericalElevation" ) &&
( buffers.sphericalElevation != nullptr ) )
buffers.sphericalElevation )
{
destBuffers.emplace_back( imf_, "sphericalElevation", buffers.sphericalElevation, count, true, scaled );
}
else if ( ( name.compare( "sphericalInvalidState" ) == 0 ) && proto.isDefined( "sphericalInvalidState" ) &&
( buffers.sphericalInvalidState != nullptr ) )
buffers.sphericalInvalidState )
{
destBuffers.emplace_back( imf_, "sphericalInvalidState", buffers.sphericalInvalidState, count, true );
}
else if ( ( name.compare( "rowIndex" ) == 0 ) && proto.isDefined( "rowIndex" ) &&
( buffers.rowIndex != nullptr ) )
buffers.rowIndex )
{
destBuffers.emplace_back( imf_, "rowIndex", buffers.rowIndex, count, true );
}
else if ( ( name.compare( "columnIndex" ) == 0 ) && proto.isDefined( "columnIndex" ) &&
( buffers.columnIndex != nullptr ) )
buffers.columnIndex )
{
destBuffers.emplace_back( imf_, "columnIndex", buffers.columnIndex, count, true );
}
else if ( ( name.compare( "returnIndex" ) == 0 ) && proto.isDefined( "returnIndex" ) &&
( buffers.returnIndex != nullptr ) )
buffers.returnIndex )
{
destBuffers.emplace_back( imf_, "returnIndex", buffers.returnIndex, count, true );
}
else if ( ( name.compare( "returnCount" ) == 0 ) && proto.isDefined( "returnCount" ) &&
( buffers.returnCount != nullptr ) )
buffers.returnCount )
{
destBuffers.emplace_back( imf_, "returnCount", buffers.returnCount, count, true );
}
else if ( ( name.compare( "timeStamp" ) == 0 ) && proto.isDefined( "timeStamp" ) &&
( buffers.timeStamp != nullptr ) )
buffers.timeStamp )
{
destBuffers.emplace_back( imf_, "timeStamp", buffers.timeStamp, count, true, scaled );
}
else if ( ( name.compare( "isTimeStampInvalid" ) == 0 ) && proto.isDefined( "isTimeStampInvalid" ) &&
( buffers.isTimeStampInvalid != nullptr ) )
buffers.isTimeStampInvalid )
{
destBuffers.emplace_back( imf_, "isTimeStampInvalid", buffers.isTimeStampInvalid, count, true );
}
else if ( ( name.compare( "intensity" ) == 0 ) && proto.isDefined( "intensity" ) &&
( buffers.intensity != nullptr ) )
buffers.intensity )
{
destBuffers.emplace_back( imf_, "intensity", buffers.intensity, count, true, scaled );
}
else if ( ( name.compare( "isIntensityInvalid" ) == 0 ) && proto.isDefined( "isIntensityInvalid" ) &&
( buffers.isIntensityInvalid != nullptr ) )
buffers.isIntensityInvalid )
{
destBuffers.emplace_back( imf_, "isIntensityInvalid", buffers.isIntensityInvalid, count, true );
}
else if ( ( name.compare( "colorRed" ) == 0 ) && proto.isDefined( "colorRed" ) &&
( buffers.colorRed != nullptr ) )
buffers.colorRed )
{
destBuffers.emplace_back( imf_, "colorRed", buffers.colorRed, count, true, scaled );
}
else if ( ( name.compare( "colorGreen" ) == 0 ) && proto.isDefined( "colorGreen" ) &&
( buffers.colorGreen != nullptr ) )
buffers.colorGreen )
{
destBuffers.emplace_back( imf_, "colorGreen", buffers.colorGreen, count, true, scaled );
}
else if ( ( name.compare( "colorBlue" ) == 0 ) && proto.isDefined( "colorBlue" ) &&
( buffers.colorBlue != nullptr ) )
buffers.colorBlue )
{
destBuffers.emplace_back( imf_, "colorBlue", buffers.colorBlue, count, true, scaled );
}
else if ( ( name.compare( "isColorInvalid" ) == 0 ) && proto.isDefined( "isColorInvalid" ) &&
( buffers.isColorInvalid != nullptr ) )
buffers.isColorInvalid )
{
destBuffers.emplace_back( imf_, "isColorInvalid", buffers.isColorInvalid, count, true );
}
else if ( haveNormalsExt && ( name.compare( "nor:normalX" ) == 0 ) && proto.isDefined( "nor:normalX" ) &&
( buffers.normalX != nullptr ) )
buffers.normalX )
{
destBuffers.emplace_back( imf_, "nor:normalX", buffers.normalX, count, true, scaled );
}
else if ( haveNormalsExt && ( name.compare( "nor:normalY" ) == 0 ) && proto.isDefined( "nor:normalY" ) &&
( buffers.normalY != nullptr ) )
buffers.normalY )
{
destBuffers.emplace_back( imf_, "nor:normalY", buffers.normalY, count, true, scaled );
}
else if ( haveNormalsExt && ( name.compare( "nor:normalZ" ) == 0 ) && proto.isDefined( "nor:normalZ" ) &&
( buffers.normalZ != nullptr ) )
buffers.normalZ )
{
destBuffers.emplace_back( imf_, "nor:normalZ", buffers.normalZ, count, true, scaled );
}

2
src/3rdParty/libE57Format/src/ScaledIntegerNodeImpl.cpp vendored
View File

@@ -183,7 +183,7 @@ namespace e57
// don't checkImageFileOpen
ustring fieldName;
if ( forcedFieldName != nullptr )
if ( forcedFieldName )
{
fieldName = forcedFieldName;
}

6
src/3rdParty/libE57Format/src/SourceDestBufferImpl.cpp vendored
View File

@@ -112,7 +112,7 @@ SourceDestBufferImpl::SourceDestBufferImpl( ImageFileImplWeakPtr destImageFile,
/// don't checkImageFileOpen, checkState_ will do it
/// Set capacity_ after testing that b is OK
if ( b == nullptr )
if ( !b )
{
throw E57_EXCEPTION2( E57_ERROR_BAD_BUFFER, "sdbuf.pathName=" + pathName );
}
@@ -291,7 +291,7 @@ void SourceDestBufferImpl::checkState_() const
if ( memoryRepresentation_ != E57_USTRING )
{
if ( base_ == nullptr )
if ( !base_ )
{
throw E57_EXCEPTION2( E57_ERROR_BAD_BUFFER, "pathName=" + pathName_ );
}
@@ -304,7 +304,7 @@ void SourceDestBufferImpl::checkState_() const
}
else
{
if ( ustrings_ == nullptr )
if ( !ustrings_ )
{
throw E57_EXCEPTION2( E57_ERROR_BAD_BUFFER, "pathName=" + pathName_ );
}

2
src/3rdParty/libE57Format/src/StringNodeImpl.cpp vendored
View File

@@ -83,7 +83,7 @@ namespace e57
// don't checkImageFileOpen
ustring fieldName;
if ( forcedFieldName != nullptr )
if ( forcedFieldName )
{
fieldName = forcedFieldName;
}

2
src/3rdParty/libE57Format/src/StructureNodeImpl.cpp vendored
View File

@@ -387,7 +387,7 @@ void StructureNodeImpl::writeXml( ImageFileImplSharedPtr imf, CheckedFile &cf, i
/// don't checkImageFileOpen
ustring fieldName;
if ( forcedFieldName != nullptr )
if ( forcedFieldName )
{
fieldName = forcedFieldName;
}

2
src/3rdParty/libE57Format/src/VectorNodeImpl.cpp vendored
View File

@@ -103,7 +103,7 @@ namespace e57
/// don't checkImageFileOpen
ustring fieldName;
if ( forcedFieldName != nullptr )
if ( forcedFieldName )
{
fieldName = forcedFieldName;
}

2
src/3rdParty/libE57Format/src/WriterImpl.cpp vendored
View File

@@ -1017,7 +1017,7 @@ namespace e57
sourceBuffers.emplace_back( imf_, "timeStamp", buffers.timeStamp, count, true, true );
}
if ( proto.isDefined( "cartesianInvalidState" ) && ( buffers.cartesianInvalidState != nullptr ) )
if ( proto.isDefined( "cartesianInvalidState" ) && buffers.cartesianInvalidState )
{
sourceBuffers.emplace_back( imf_, "cartesianInvalidState", buffers.cartesianInvalidState, count, true );
}