orthanc: OrthancServer/ServerIndex.cpp comparison

comparison OrthancServer/ServerIndex.cpp @ 656:08eca5d86aad

fixes to cppcheck

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 04 Nov 2013 11:19:31 +0100
parents	fb49bf72ac2d
children	3bdb5db8e839 2d0a347e8cfc

comparison

equal deleted inserted replaced

-:93adc693cc60
+:08eca5d86aad
 void CommitFilesToRemove()
 {
 for (std::list<std::string>::iterator
 it = pendingFilesToRemove_.begin();
-it != pendingFilesToRemove_.end(); it++)
+it != pendingFilesToRemove_.end(); ++it)
 {
 context_.RemoveFile(*it);
 }
 }
 static void ComputeExpectedNumberOfInstances(DatabaseWrapper& db,
 int64_t series,
 const DicomMap& dicomSummary)
 {
-const DicomValue* value;
+try
-const DicomValue* value2;
+{
+const DicomValue* value;
+const DicomValue* value2;
-try
-{
 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL &&
 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL)
 {
 // Patch for series with temporal positions thanks to Will Ryder
 int64_t imagesInAcquisition = boost::lexical_cast<int64_t>(value->AsString());
 }
 // Ensure there is enough room in the storage for the new instance
 uint64_t instanceSize = 0;
 for (Attachments::const_iterator it = attachments.begin();
-it != attachments.end(); it++)
+it != attachments.end(); ++it)
 {
 instanceSize += it->GetCompressedSize();
 }
 Recycle(instanceSize, hasher.HashPatient());
 assert(series != -1);
 assert(instance != -1);
 // Attach the files to the newly created instance
 for (Attachments::const_iterator it = attachments.begin();
-it != attachments.end(); it++)
+it != attachments.end(); ++it)
 {
 db_->AddAttachment(instance, *it);
 }
 // Attach the metadata
 size_t expected;
 try
 {
 expected = boost::lexical_cast<size_t>(s);
-if (expected < 0)
-{
-return SeriesStatus_Unknown;
-}
 }
 catch (boost::bad_lexical_cast&)
 {
 return SeriesStatus_Unknown;
 }
 std::list<int64_t> children;
 db_->GetChildrenInternalId(children, id);
 std::set<size_t> instances;
 for (std::list<int64_t>::const_iterator
-it = children.begin(); it != children.end(); it++)
+it = children.begin(); it != children.end(); ++it)
 {
 // Get the index of this instance in the series
 s = db_->GetMetadata(*it, MetadataType_Instance_IndexInSeries);
 size_t index;
 try
 catch (boost::bad_lexical_cast&)
 {
 return SeriesStatus_Unknown;
 }
-if (index <= 0 || index > expected)
+if (!(index > 0 && index <= expected))
 {
 // Out-of-range instance index
 return SeriesStatus_Inconsistent;
 }
 if (type != ResourceType_Instance)
 {
 Json::Value c = Json::arrayValue;
 for (std::list<std::string>::const_iterator
-it = children.begin(); it != children.end(); it++)
+it = children.begin(); it != children.end(); ++it)
 {
 c.append(*it);
 }
 switch (type)
 else
 {
 // Tag all the children of this resource as to be explored
 db_->GetChildrenInternalId(tmp, resource);
 for (std::list<int64_t>::const_iterator
-it = tmp.begin(); it != tmp.end(); it++)
+it = tmp.begin(); it != tmp.end(); ++it)
 {
 toExplore.push(*it);
 }
 }
 }
 {
 std::list<FileContentType> f;
 db_->ListAvailableAttachments(f, resource);
 for (std::list<FileContentType>::const_iterator
-it = f.begin(); it != f.end(); it++)
+it = f.begin(); it != f.end(); ++it)
 {
 FileInfo attachment;
 if (db_->LookupAttachment(attachment, resource, *it))
 {
 compressedSize += attachment.GetCompressedSize();
 // Tag all the children of this resource as to be explored
 std::list<int64_t> tmp;
 db_->GetChildrenInternalId(tmp, resource);
 for (std::list<int64_t>::const_iterator
-it = tmp.begin(); it != tmp.end(); it++)
+it = tmp.begin(); it != tmp.end(); ++it)
 {
 toExplore.push(*it);
 }
 }
 }
 std::list<int64_t> id;
 db_->LookupTagValue(id, tag, value);
 for (std::list<int64_t>::const_iterator
-it = id.begin(); it != id.end(); it++)
+it = id.begin(); it != id.end(); ++it)
 {
 if (db_->GetResourceType(*it) == type)
 {
 result.push_back(db_->GetPublicId(*it));
 }
 std::list<int64_t> id;
 db_->LookupTagValue(id, tag, value);
 for (std::list<int64_t>::const_iterator
-it = id.begin(); it != id.end(); it++)
+it = id.begin(); it != id.end(); ++it)
 {
 result.push_back(db_->GetPublicId(*it));
 }
 }
 std::list<int64_t> id;
 db_->LookupTagValue(id, value);
 for (std::list<int64_t>::const_iterator
-it = id.begin(); it != id.end(); it++)
+it = id.begin(); it != id.end(); ++it)
 {
 result.push_back(db_->GetPublicId(*it));
 }
 }
 }

Mercurial > hg > orthanc

comparison OrthancServer/ServerIndex.cpp @ 656:08eca5d86aad