commit 45db1699c3b9d1f32d5ddf44fc32b0956cc47863
author Glenn Kasten <gkasten@google.com> Thu Mar 24 11:43:42 2016 -0700
committer Glenn Kasten <gkasten@google.com> Mon Mar 28 14:28:28 2016 -0700
tree 40af4f56a02c5c28011db28eafb267c60d5a2842
parent 46e30faab3cf9dff4f8da2e597e44eb3c0a8a743

Fix build warnings

Also fix a memory leak

Change-Id: I21e66d7e5bede3ecf1da497dc8b9e20e6f076d54

audio_route/audio_route.c

diff --git a/audio_route/audio_route.c b/audio_route/audio_route.c
index 99db0ee..90b114d 100644
--- a/audio_route/audio_route.c
+++ b/audio_route/audio_route.c
@@ -123,6 +123,7 @@
     return ar->mixer_state[ctl_index].ctl;
 }
 
+#if 0
 static void path_print(struct audio_route *ar, struct mixer_path *path)
 {
     unsigned int i;
@@ -145,6 +146,7 @@
         }
     }
 }
+#endif
 
 static void path_free(struct audio_route *ar)
 {
@@ -160,6 +162,8 @@
         }
     }
     free(ar->mixer_path);
+    ar->mixer_path = NULL;
+    ar->mixer_path_size = 0;
 }
 
 static struct mixer_path *path_get_by_name(struct audio_route *ar,
@@ -392,7 +396,6 @@
 static int path_reset(struct audio_route *ar, struct mixer_path *path)
 {
     unsigned int i;
-    unsigned int j;
     unsigned int ctl_index;
     struct mixer_ctl *ctl;
     enum mixer_ctl_type type;
@@ -556,7 +559,6 @@
 static int alloc_mixer_state(struct audio_route *ar)
 {
     unsigned int i;
-    unsigned int j;
     unsigned int num_values;
     struct mixer_ctl *ctl;
     enum mixer_ctl_type type;
@@ -838,7 +840,6 @@
     FILE *file;
     int bytes_read;
     void *buf;
-    int i;
     struct audio_route *ar;
 
     ar = calloc(1, sizeof(struct audio_route));
@@ -910,6 +911,7 @@
     return ar;
 
 err_parse:
+    path_free(ar);
     XML_ParserFree(parser);
 err_parser_create:
     fclose(file);
@@ -928,5 +930,6 @@
 {
     free_mixer_state(ar);
     mixer_close(ar->mixer);
+    path_free(ar);
     free(ar);
 }