From 65517aebee0a7624b31dd9ce481e7f00ece3d497 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Fri, 23 Dec 2011 21:48:46 +0100
Subject: Fix warnings found by -Wshadow
---
Makefile | 2 +-
src/ui.c | 3 ---
src/ui_act.c | 24 ++++++++++++------------
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 819d7ac..5ecbd8c 100644
--- a/Makefile
+++ b/Makefile
@@ -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}
diff --git a/src/ui.c b/src/ui.c
index 82d2780..c474a3d 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -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') {
--
cgit v1.2.3