# HG changeset patch # User Chris Cannam # Date 1337330899 -3600 # Node ID 7eb389da797649c63566a6fa90ca016bd71f209b # Parent 21d39720d5da09b8c7d2ceb7b67784398dd924c8 Fix cppcheck warnings diff -r 21d39720d5da -r 7eb389da7976 plugin/DSSIPluginInstance.cpp --- a/plugin/DSSIPluginInstance.cpp Mon Mar 05 08:48:36 2012 +0000 +++ b/plugin/DSSIPluginInstance.cpp Fri May 18 09:48:19 2012 +0100 @@ -455,12 +455,12 @@ void DSSIPluginInstance::instantiate(unsigned long sampleRate) { + if (!m_descriptor) return; + #ifdef DEBUG_DSSI std::cout << "DSSIPluginInstance::instantiate - plugin \"unique\" id = " << m_descriptor->LADSPA_Plugin->UniqueID << std::endl; #endif - if (!m_descriptor) return; - const LADSPA_Descriptor *descriptor = m_descriptor->LADSPA_Plugin; if (!descriptor->instantiate) { diff -r 21d39720d5da -r 7eb389da7976 plugin/LADSPAPluginInstance.cpp --- a/plugin/LADSPAPluginInstance.cpp Mon Mar 05 08:48:36 2012 +0000 +++ b/plugin/LADSPAPluginInstance.cpp Fri May 18 09:48:19 2012 +0100 @@ -379,11 +379,12 @@ void LADSPAPluginInstance::instantiate(unsigned long sampleRate) { + if (!m_descriptor) return; + #ifdef DEBUG_LADSPA std::cout << "LADSPAPluginInstance::instantiate - plugin unique id = " << m_descriptor->UniqueID << std::endl; #endif - if (!m_descriptor) return; if (!m_descriptor->instantiate) { std::cerr << "Bad plugin: plugin id " << m_descriptor->UniqueID diff -r 21d39720d5da -r 7eb389da7976 rdf/SimpleSPARQLQuery.h --- a/rdf/SimpleSPARQLQuery.h Mon Mar 05 08:48:36 2012 +0000 +++ b/rdf/SimpleSPARQLQuery.h Fri May 18 09:48:19 2012 +0100 @@ -16,6 +16,8 @@ #ifndef _SIMPLE_SPARQL_QUERY_H_ #define _SIMPLE_SPARQL_QUERY_H_ +#ifdef NOT_DEFINED + #include #include #include @@ -111,3 +113,5 @@ }; #endif + +#endif