Minor changes recommended by cppcheck and clang++

src/buffer/buffer.hpp

@@ -51,6 +51,7 @@ namespace Main
    class WindowBuffer
    {
    public:
+		virtual ~WindowBuffer() { }
       virtual size_t Size() const = 0;
       virtual std::string String(uint32_t position) const { return ""; }
       virtual std::string PrintString(uint32_t position) const { return ""; }

src/buffer/library.cpp

@@ -454,6 +454,12 @@ std::string Library::String(uint32_t position) const
    {
       return Get(position)->album_;
    }
+   else if (Get(position)->type_ == Mpc::SongType)
+   {
+      return Get(position)->song_->FormatString(settings_.Get(Setting::LibraryFormat));
+   }
+
+	return "";
 }
 
 std::string Library::PrintString(uint32_t position) const
@@ -470,6 +476,8 @@ std::string Library::PrintString(uint32_t position) const
    {
       return "       " + Get(position)->song_->FormatString(settings_.Get(Setting::LibraryFormat));
    }
+
+	return "";
 }
 
 

src/buffer/list.hpp

@@ -31,8 +31,8 @@ namespace Mpc
    class List
    {
       public:
-         List(std::string const name) : path_(name), name_(name) { }
-         List(std::string const path, std::string const name) : path_(path), name_(name) { }
+         List(std::string const & name) : path_(name), name_(name) { }
+         List(std::string const & path, std::string const & name) : path_(path), name_(name) { }
 
          bool operator!=(Mpc::List const & rhs) const
          {

src/callback.hpp

@@ -34,6 +34,7 @@ namespace Main
    class CallbackInterface
    {
       public:
+		virtual ~CallbackInterface() { }
       virtual void operator() (Parameter) = 0;
    };
 

src/mode/command.cpp

@@ -469,9 +469,9 @@ void Command::QuitAll(std::string const & arguments)
 
 void Command::Volume(std::string const & arguments)
 {
-   uint32_t Vol = atoi(arguments.c_str());
+   uint32_t Vol = (uint32_t) atoi(arguments.c_str());
 
-   if ((Vol <= 100) && (Vol >= 0))
+   if (Vol <= 100)
    {
       Player::Volume(Vol);
    }
@@ -1096,7 +1096,7 @@ void Command::DebugClient(std::string const & arguments)
 
 void Command::TestScreen(std::string const & arguments)
 {
-   screen_.ActiveWindow().ScrollTo(999999);
+   screen_.ActiveWindow().ScrollTo(65535);
    screen_.ScrollTo(screen_.ActiveWindow().Playlist(0));
    screen_.ScrollTo(screen_.ActiveWindow().Current());
    screen_.ActiveWindow().ScrollTo(0);

src/mode/normal.cpp

@@ -620,7 +620,7 @@ std::string Normal::InputCharToString(int input) const
    std::string result    = "";
    bool        converted = false;
 
-   if (conversionTable.size() == 0)
+   if (conversionTable.empty() == true)
    {
       conversionTable[ESCAPE_KEY]    = "Esc";
       conversionTable[KEY_PPAGE]     = "PageUp";
@@ -706,7 +706,7 @@ std::string Normal::MouseInputToString() const
 #ifdef HAVE_MOUSE_SUPPORT
    static std::map<uint32_t, std::string> conversionTable;
 
-   if (conversionTable.size() == 0)
+   if (conversionTable.empty() == true)
    {
       conversionTable[BUTTON4_PRESSED]        = "ScrollWheelUp";
       conversionTable[BUTTON2_PRESSED]        = "ScrollWheelDown";
@@ -736,9 +736,8 @@ std::string Normal::MouseInputToString() const
 
       return "";
    }
-#else
-   return "";
 #endif
+   return "";
 }
 
 
@@ -1312,12 +1311,11 @@ void Normal::DisplayModeLine()
 
 std::string Normal::ScrollString()
 {
-   float currentScroll = 0.0;
    std::ostringstream scrollStream;
 
    if (screen_.ActiveWindow().BufferSize() > 0)
    {
-      currentScroll = ((screen_.ActiveWindow().CurrentLine())/(static_cast<float>(screen_.ActiveWindow().BufferSize()) - 2));
+      float currentScroll = ((screen_.ActiveWindow().CurrentLine())/(static_cast<float>(screen_.ActiveWindow().BufferSize()) - 2));
       currentScroll += .005;
       scrollStream << (screen_.ActiveWindow().CurrentLine() + 1) << "/" << screen_.ActiveWindow().BufferSize() << " -- ";
 

src/mpdclient.cpp

@@ -143,7 +143,6 @@ void Client::Connect(std::string const & hostname, uint16_t port, uint32_t timeo
    uint16_t    connect_port     = port;
    uint32_t    connect_timeout  = timeout_ms;
    std::string connect_password = "";
-   size_t      pos;
 
    DeleteConnection();
 
@@ -155,8 +154,9 @@ void Client::Connect(std::string const & hostname, uint16_t port, uint32_t timeo
       {
          connect_hostname = host_env;
 
-         pos = connect_hostname.find_last_of("@");
-         if ( pos != connect_hostname.npos )
+         size_t const pos = connect_hostname.find_last_of("@");
+
+         if (pos != connect_hostname.npos)
          {
             connect_password = connect_hostname.substr(0, pos);
             connect_hostname = connect_hostname.substr(pos + 1);

src/screen.cpp

@@ -580,13 +580,10 @@ void Screen::Update()
       }
 
       // Paint the main window
-      if (MaxRows() >= 0)
-      {
-         for (uint32_t i = 0; (i < static_cast<uint32_t>(MaxRows())); ++i)
-         {
-            ActiveWindow().Print(i);
-         }
-      }
+		for (uint32_t i = 0; (i < static_cast<uint32_t>(MaxRows())); ++i)
+		{
+			ActiveWindow().Print(i);
+		}
 
       ActiveWindow().Refresh();