commit 161c1cc8ef87c11e7fcb8a32f8bdf2f3fd627e90
author The Android Open Source Project <initial-contribution@android.com> Tue Aug 21 16:07:37 2012 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Aug 21 16:07:37 2012 -0700
tree 9708c4cabf0995ae461307fc5e65c5b8fb2426c6
parent 8fde167ba27de7f4e302c8fb23380ddca7655989
parent c5a4eb547e7e9c443f4a47a450fce95939241dd0

Reconcile with jb-mr1-release - do not merge

Change-Id: Ie51b5f85342674d507d7db2e7fb681f0f4088693

libsync/sync_test.c

diff --git a/libsync/sync_test.c b/libsync/sync_test.c
index a75f671..386747a 100644
--- a/libsync/sync_test.c
+++ b/libsync/sync_test.c
@@ -72,7 +72,7 @@
     return NULL;
 }
 
-int main(int argc, char *argv[])
+int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused)))
 {
     struct sync_thread_data sync_data[4];
     pthread_t threads[4];

libzipfile/test_zipfile.c

diff --git a/libzipfile/test_zipfile.c b/libzipfile/test_zipfile.c
index 40840ec..1aaa913 100644
--- a/libzipfile/test_zipfile.c
+++ b/libzipfile/test_zipfile.c
@@ -1,5 +1,5 @@
 #include <zipfile/zipfile.h>

-

+#include <string.h>

 #include <stdio.h>

 #include <stdlib.h>

 

@@ -55,6 +55,8 @@
 

     switch (what)

     {

+        case HUH:

+            break;

         case LIST:

             dump_zipfile(stdout, zip);

             break;