diff options
| author | Lars-Dominik Braun <lars@6xq.net> | 2011-12-23 21:48:46 +0100 |
|---|---|---|
| committer | Lars-Dominik Braun <lars@6xq.net> | 2011-12-23 21:48:46 +0100 |
| commit | 65517aebee0a7624b31dd9ce481e7f00ece3d497 (patch) | |
| tree | 361eba35e743d058a7d078050064acb8fd02fd43 | |
| parent | be22806715ee51b5bb8d1fe9953f74bb2ee32792 (diff) | |
| download | pianobar-65517aebee0a7624b31dd9ce481e7f00ece3d497.tar.gz pianobar-65517aebee0a7624b31dd9ce481e7f00ece3d497.tar.bz2 pianobar-65517aebee0a7624b31dd9ce481e7f00ece3d497.zip | |
Fix warnings found by -Wshadow
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/ui.c | 3 | ||||
| -rw-r--r-- | src/ui_act.c | 24 |
3 files changed, 13 insertions, 16 deletions
@@ -130,7 +130,7 @@ clean: all: pianobar debug: pianobar -debug: CFLAGS=-Wall -pedantic -ggdb -Wmissing-declarations +debug: CFLAGS=-pedantic -ggdb -Wall -Wmissing-declarations -Wshadow waitress-test: CFLAGS+= -DTEST waitress-test: ${LIBWAITRESS_OBJ} @@ -566,9 +566,6 @@ void BarStationFromGenre (BarApp_t *app) { /* receive genre stations list if not yet available */ if (app->ph.genreStations == NULL) { - PianoReturn_t pRet; - WaitressReturn_t wRet; - BarUiMsg (&app->settings, MSG_INFO, "Receiving genre stations... "); if (!BarUiPianoCall (app, PIANO_REQUEST_GET_GENRE_STATIONS, NULL, &pRet, &wRet)) { diff --git a/src/ui_act.c b/src/ui_act.c index c6fb01c..df6cb73 100644 --- a/src/ui_act.c +++ b/src/ui_act.c @@ -636,39 +636,39 @@ BarUiActCallback(BarUiActManageStation) { PianoArtist_t *artist = BarUiSelectArtist (app, reqData.info.artistSeeds); if (artist != NULL) { - PianoRequestDataDeleteSeed_t reqData; + PianoRequestDataDeleteSeed_t subReqData; - memset (&reqData, 0, sizeof (reqData)); - reqData.artist = artist; + memset (&subReqData, 0, sizeof (subReqData)); + subReqData.artist = artist; BarUiMsg (&app->settings, MSG_INFO, "Deleting artist seed... "); - BarUiActDefaultPianoCall (PIANO_REQUEST_DELETE_SEED, &reqData); + BarUiActDefaultPianoCall (PIANO_REQUEST_DELETE_SEED, &subReqData); BarUiActDefaultEventcmd ("stationdeleteartistseed"); } } else if (selectBuf[0] == 's') { PianoSong_t *song = BarUiSelectSong (&app->settings, reqData.info.songSeeds, &app->input); if (song != NULL) { - PianoRequestDataDeleteSeed_t reqData; + PianoRequestDataDeleteSeed_t subReqData; - memset (&reqData, 0, sizeof (reqData)); - reqData.song = song; + memset (&subReqData, 0, sizeof (subReqData)); + subReqData.song = song; BarUiMsg (&app->settings, MSG_INFO, "Deleting song seed... "); - BarUiActDefaultPianoCall (PIANO_REQUEST_DELETE_SEED, &reqData); + BarUiActDefaultPianoCall (PIANO_REQUEST_DELETE_SEED, &subReqData); BarUiActDefaultEventcmd ("stationdeletesongseed"); } } else if (selectBuf[0] == 't') { PianoStation_t *station = BarUiSelectStation (app, reqData.info.stationSeeds, "Delete seed station: ", NULL); if (station != NULL) { - PianoRequestDataDeleteSeed_t reqData; + PianoRequestDataDeleteSeed_t subReqData; - memset (&reqData, 0, sizeof (reqData)); - reqData.station = station; + memset (&subReqData, 0, sizeof (subReqData)); + subReqData.station = station; BarUiMsg (&app->settings, MSG_INFO, "Deleting station seed... "); - BarUiActDefaultPianoCall (PIANO_REQUEST_DELETE_SEED, &reqData); + BarUiActDefaultPianoCall (PIANO_REQUEST_DELETE_SEED, &subReqData); BarUiActDefaultEventcmd ("stationdeletestationseed"); } } else if (selectBuf[0] == 'f') { |