Mercurial > hg > svcore
comparison plugin/PiperVampPluginFactory.cpp @ 1582:70e172e6cc59 fix-static-analysis
Use nullptr throughout
| author | Chris Cannam | 
|---|---|
| date | Mon, 26 Nov 2018 14:33:41 +0000 | 
| parents | 2b532ff7f22e | 
| children | 5f8fbbde08ff | 
   comparison
  equal
  deleted
  inserted
  replaced
| 1581:ad5f892c0c4d | 1582:70e172e6cc59 | 
|---|---|
| 172 { | 172 { | 
| 173 Profiler profiler("PiperVampPluginFactory::instantiatePlugin"); | 173 Profiler profiler("PiperVampPluginFactory::instantiatePlugin"); | 
| 174 | 174 | 
| 175 if (m_origins.find(identifier) == m_origins.end()) { | 175 if (m_origins.find(identifier) == m_origins.end()) { | 
| 176 SVCERR << "ERROR: No known server for identifier " << identifier << endl; | 176 SVCERR << "ERROR: No known server for identifier " << identifier << endl; | 
| 177 return 0; | 177 return nullptr; | 
| 178 } | 178 } | 
| 179 | 179 | 
| 180 auto psd = getPluginStaticData(identifier); | 180 auto psd = getPluginStaticData(identifier); | 
| 181 if (psd.pluginKey == "") { | 181 if (psd.pluginKey == "") { | 
| 182 return 0; | 182 return nullptr; | 
| 183 } | 183 } | 
| 184 | 184 | 
| 185 SVDEBUG << "PiperVampPluginFactory: Creating PiperAutoPlugin for server " | 185 SVDEBUG << "PiperVampPluginFactory: Creating PiperAutoPlugin for server " | 
| 186 << m_origins[identifier] << ", identifier " << identifier << endl; | 186 << m_origins[identifier] << ", identifier " << identifier << endl; | 
| 187 | 187 | 
| 192 0, | 192 0, | 
| 193 m_logger); | 193 m_logger); | 
| 194 | 194 | 
| 195 if (!ap->isOK()) { | 195 if (!ap->isOK()) { | 
| 196 delete ap; | 196 delete ap; | 
| 197 return 0; | 197 return nullptr; | 
| 198 } | 198 } | 
| 199 | 199 | 
| 200 return ap; | 200 return ap; | 
| 201 } | 201 } | 
| 202 | 202 | 
