eliminate compiler warnings

This commit is contained in:
Andrzej Rybczak
2009-01-17 14:17:24 +01:00
parent fd5a3e142c
commit 351ddc8584
2 changed files with 5 additions and 3 deletions

View File

@@ -2721,7 +2721,7 @@ int main(int argc, char *argv[])
|| (wCurrent == mEditorTags && !mEditorTags->Empty())) || (wCurrent == mEditorTags && !mEditorTags->Empty()))
{ {
size_t id = ((Menu<Song> *)wCurrent)->Choice(); size_t id = ((Menu<Song> *)wCurrent)->Choice();
Song *s; Song *s = 0;
switch (current_screen) switch (current_screen)
{ {
case csPlaylist: case csPlaylist:
@@ -3309,7 +3309,7 @@ int main(int argc, char *argv[])
|| (wCurrent == mPlaylistEditor && !mPlaylistEditor->Empty()) || (wCurrent == mPlaylistEditor && !mPlaylistEditor->Empty())
|| (wCurrent == mEditorTags && !mEditorTags->Empty())) || (wCurrent == mEditorTags && !mEditorTags->Empty()))
{ {
Song *s; Song *s = 0;
size_t id = ((Menu<Song> *)wCurrent)->Choice(); size_t id = ((Menu<Song> *)wCurrent)->Choice();
switch (current_screen) switch (current_screen)
{ {
@@ -3460,7 +3460,7 @@ int main(int argc, char *argv[])
{ {
LOAD_LYRICS: LOAD_LYRICS:
Song *s; Song *s = 0;
int id; int id;
if (reload_lyrics) if (reload_lyrics)

View File

@@ -378,6 +378,8 @@ string Window::GetString(const string &base, size_t length, size_t width) const
if (wcwidth(*it) > 1) if (wcwidth(*it) > 1)
block_scrolling = 1; block_scrolling = 1;
beginning = -1;
do do
{ {
if (tmp.empty()) if (tmp.empty())