commit 0ad682cddef396c91707a31d4982dc55206dca1b
author Glenn Kasten <gkasten@google.com> Thu Mar 15 15:45:19 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 15 15:45:19 2012 -0700
tree caddef67ccc69d7f00031f21f003e91dbc8a4735
parent c4c631a15f04bdcbf8c70737e818c7e4efd5ff7b
parent 86c7cc81891a69ace7044de667b0624c284ee82b

Merge "Add get_sched_policy_name() and use in ps and top"

include/system/audio.h

diff --git a/include/system/audio.h b/include/system/audio.h
index 0980319..4aee2c0 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -447,18 +447,18 @@
     size_t size = 0;
 
     switch (format) {
-        case AUDIO_FORMAT_PCM_32_BIT:
-        case AUDIO_FORMAT_PCM_8_24_BIT:
-            size = sizeof(int32_t);
-            break;
-        case AUDIO_FORMAT_PCM_16_BIT:
-            size = sizeof(int16_t);
-            break;
-        case AUDIO_FORMAT_PCM_8_BIT:
-            size = sizeof(uint8_t);
-            break;
-        default:
-            break;
+    case AUDIO_FORMAT_PCM_32_BIT:
+    case AUDIO_FORMAT_PCM_8_24_BIT:
+        size = sizeof(int32_t);
+        break;
+    case AUDIO_FORMAT_PCM_16_BIT:
+        size = sizeof(int16_t);
+        break;
+    case AUDIO_FORMAT_PCM_8_BIT:
+        size = sizeof(uint8_t);
+        break;
+    default:
+        break;
     }
     return size;
 }

libcutils/str_parms.c

diff --git a/libcutils/str_parms.c b/libcutils/str_parms.c
index 16138f6..364695c 100644
--- a/libcutils/str_parms.c
+++ b/libcutils/str_parms.c
@@ -128,8 +128,10 @@
 
         /* if we replaced a value, free it */
         old_val = hashmapPut(str_parms->map, key, value);
-        if (old_val)
+        if (old_val) {
             free(old_val);
+            free(key);
+        }
 
         items++;
 next_pair:
@@ -167,6 +169,7 @@
 
     if (old_val) {
         free(old_val);
+        free(tmp_key);
     } else if (errno == ENOMEM) {
         free(tmp_key);
         free(tmp_val);
@@ -327,6 +330,7 @@
     test_str_parms_str("foo=bar;baz=");
     test_str_parms_str("foo=bar;baz=bat");
     test_str_parms_str("foo=bar;baz=bat;");
+    test_str_parms_str("foo=bar;baz=bat;foo=bar");
 
     return 0;
 }