Fix building warnings

3 files changed, 4 insertions, 31 deletions

diff --git a/Android.mk b/Android.mk
index ae9c174..a70a5aa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,4 +35,6 @@ LOCAL_C_INCLUDES := \
 	external/tinyalsa/include \
 	$(call include-path-for, audio-utils)
 
+LOCAL_CFLAGS := -Wno-unused-variable
+
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio_hw.c b/audio_hw.c
index b683c67..b0b1a0c 100644
--- a/audio_hw.c
+++ b/audio_hw.c
@@ -554,8 +554,8 @@ static ssize_t read_frames(struct stream_in *in, void *buffer, ssize_t frames)
                     &frames_rd);
         } else {
             struct resampler_buffer buf = {
-                    { raw : NULL, },
-                    frame_count : frames_rd,
+                    { .raw = NULL, },
+                    .frame_count = frames_rd,
             };
             get_next_buffer(&in->buf_provider, &buf);
             if (buf.raw != NULL) {
@@ -1117,7 +1117,6 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
     *stream_out = &out->stream;
     return 0;
 
-err_open:
     free(out);
     *stream_out = NULL;
     return ret;
diff --git a/audio_route.c b/audio_route.c
index f8b4e03..09ef164 100644
--- a/audio_route.c
+++ b/audio_route.c
@@ -72,24 +72,6 @@ struct config_parse_state {
 
 /* path functions */
 
-static void path_free(struct audio_route *ar)
-{
-    unsigned int i;
-
-    if (!ar) {
-        ALOGE("%s: invalid audio_route", __FUNCTION__);
-        return;
-    }
-
-    for (i = 0; i < ar->num_mixer_paths; i++) {
-        if (ar->mixer_path[i].name)
-            free(ar->mixer_path[i].name);
-        if (ar->mixer_path[i].setting)
-            free(ar->mixer_path[i].setting);
-    }
-    free(ar->mixer_path);
-}
-
 static struct mixer_path *path_get_by_name(struct audio_route *ar,
                                            const char *name)
 {
@@ -206,16 +188,6 @@ static int path_add_path(struct mixer_path *path, struct mixer_path *sub_path)
     return 0;
 }
 
-static void path_print(struct mixer_path *path)
-{
-    unsigned int i;
-
-    ALOGV("Path: %s, length: %d", path->name, path->length);
-    for (i = 0; i < path->length; i++)
-        ALOGV("  %d: %s -> %d", i, mixer_ctl_get_name(path->setting[i].ctl),
-              path->setting[i].value);
-}
-
 static int path_apply(struct audio_route *ar, struct mixer_path *path)
 {
     unsigned int i;