am 835526fd: Merge "Cleanup: warning fixit."

* commit '835526fdc035cad6d712a7098d0eae37b3995d2c':
  Cleanup: warning fixit.

fs_mgr/fs_mgr_fstab.c

@@ -337,7 +337,7 @@ void fs_mgr_free_fstab(struct fstab *fstab)
 /* Add an entry to the fstab, and return 0 on success or -1 on error */
 int fs_mgr_add_entry(struct fstab *fstab,
                      const char *mount_point, const char *fs_type,
-                     const char *blk_device, long long length)
+                     const char *blk_device)
 {
     struct fstab_rec *new_fstab_recs;
     int n = fstab->num_entries;

fs_mgr/fs_mgr_main.c

@@ -80,10 +80,10 @@ int main(int argc, char *argv[])
     int a_flag=0;
     int u_flag=0;
     int n_flag=0;
-    char *n_name;
+    char *n_name=NULL;
-    char *n_blk_dev;
+    char *n_blk_dev=NULL;
-    char *fstab_file;
+    char *fstab_file=NULL;
-    struct fstab *fstab;
+    struct fstab *fstab=NULL;
 
     klog_init();
     klog_set_level(6);

fs_mgr/include/fs_mgr.h

@@ -57,7 +57,7 @@ int fs_mgr_get_crypt_info(struct fstab *fstab, char *key_loc,
                           char *real_blk_device, int size);
 int fs_mgr_add_entry(struct fstab *fstab,
                      const char *mount_point, const char *fs_type,
-                     const char *blk_device, long long length);
+                     const char *blk_device);
 struct fstab_rec *fs_mgr_get_entry_for_mount_point(struct fstab *fstab, const char *path);
 int fs_mgr_is_voldmanaged(struct fstab_rec *fstab);
 int fs_mgr_is_nonremovable(struct fstab_rec *fstab);

healthd/healthd_board_default.cpp

@@ -16,13 +16,13 @@
 
 #include <healthd.h>
 
-void healthd_board_init(struct healthd_config *config)
+void healthd_board_init(struct healthd_config*)
 {
     // use defaults
 }
 
 
-int healthd_board_battery_update(struct android::BatteryProperties *props)
+int healthd_board_battery_update(struct android::BatteryProperties*)
 {
     // return 0 to log periodic polled battery status to kernel log
     return 0;

libpixelflinger/codeflinger/disassem.c

@@ -301,19 +301,14 @@ static u_int disassemble_readword(u_int address);
 static void disassemble_printaddr(u_int address);
 
 u_int
-disasm(const disasm_interface_t *di, u_int loc, int altfmt)
+disasm(const disasm_interface_t *di, u_int loc, int __unused altfmt)
 {
 	const struct arm32_insn *i_ptr = &arm32_i[0];
-
+	u_int insn = di->di_readword(loc);
-	u_int insn;
+	int matchp = 0;
-	int matchp;
 	int branch;
 	char* f_ptr;
-	int fmt;
+	int fmt = 0;
-
-	fmt = 0;
-	matchp = 0;
-	insn = di->di_readword(loc);
 
 /*	di->di_printf("loc=%08x insn=%08x : ", loc, insn);*/
 
@@ -670,7 +665,7 @@ disasm_insn_ldrhstrh(const disasm_interface_t *di, u_int insn, u_int loc)
 }
 
 static void
-disasm_insn_ldcstc(const disasm_interface_t *di, u_int insn, u_int loc)
+disasm_insn_ldcstc(const disasm_interface_t *di, u_int insn, u_int __unused loc)
 {
 	if (((insn >> 8) & 0xf) == 1)
 		di->di_printf("f%d, ", (insn >> 12) & 0x07);

libpixelflinger/codeflinger/disassem.h

@@ -49,8 +49,8 @@ extern "C" {
 
 typedef struct {
 	u_int	(*di_readword)(u_int);
-	void	(*di_printaddr)(u_int);	
+	void	(*di_printaddr)(u_int);
-	void	(*di_printf)(const char *, ...);
+	int	(*di_printf)(const char *, ...);
 } disasm_interface_t;
 
 /* Prototypes for callable functions */

libsuspend/autosuspend_earlysuspend.c

@@ -75,13 +75,8 @@ static int wait_for_fb_sleep(void)
     return err < 0 ? err : 0;
 }
 
-static void *earlysuspend_thread_func(void *arg)
+static void *earlysuspend_thread_func(void __unused *arg)
 {
-    char buf[80];
-    char wakeup_count[20];
-    int wakeup_count_len;
-    int ret;
-
     while (1) {
         if (wait_for_fb_sleep()) {
             ALOGE("Failed reading wait_for_fb_sleep, exiting earlysuspend thread\n");

libutils/tests/BasicHashtable_test.cpp

@@ -397,7 +397,7 @@ TEST_F(BasicHashtableTest, Next_WhenNonEmpty_IteratesOverAllEntries) {
         const SimpleEntry& entry = h.entryAt(index);
         ASSERT_GE(entry.key, 0);
         ASSERT_LT(entry.key, N);
-        ASSERT_EQ(false, set[entry.key]);
+        ASSERT_FALSE(set[entry.key]);
         ASSERT_EQ(entry.key * 10, entry.value);
 
         set[entry.key] = true;

libutils/tests/LruCache_test.cpp

@@ -184,7 +184,7 @@ TEST_F(LruCacheTest, StressTest) {
 
     for (size_t i = 0; i < kNumKeys; i++) {
         strings[i] = (char *)malloc(16);
-        sprintf(strings[i], "%d", i);
+        sprintf(strings[i], "%zu", i);
     }
 
     srandom(12345);