Fixes:

  toys/android/getprop.c:56:39: warning: incompatible pointer types
    passing 'void (void *, const char *, const char *)' to parameter of
    type 'void (*)(void *, const char *, const char *, uint32_t)'
    (aka 'void (*)(void *, const char *, const char *, unsigned int)')
    [-Wincompatible-pointer-types]

  __system_property_read_callback(pi, read_callback, NULL);
                                      ^~~~~~~~~~~~~
---
 toys/android/getprop.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
From 6a624e49d478255acb863edafe72a6a94147fc18 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <e...@google.com>
Date: Wed, 22 Mar 2017 10:35:14 -0700
Subject: [PATCH] Fix the type of the callback in getprop.

Fixes:

  toys/android/getprop.c:56:39: warning: incompatible pointer types
    passing 'void (void *, const char *, const char *)' to parameter of
    type 'void (*)(void *, const char *, const char *, uint32_t)'
    (aka 'void (*)(void *, const char *, const char *, unsigned int)')
    [-Wincompatible-pointer-types]

  __system_property_read_callback(pi, read_callback, NULL);
                                      ^~~~~~~~~~~~~
---
 toys/android/getprop.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toys/android/getprop.c b/toys/android/getprop.c
index eede937..04a9b28 100644
--- a/toys/android/getprop.c
+++ b/toys/android/getprop.c
@@ -39,7 +39,8 @@ static char *get_property_context(const char *property)
   return context;
 }
 
-static void read_callback(void *unused, const char *name, const char *value)
+static void read_callback(void *unused, const char *name, const char *value,
+                          unsigned serial)
 {
   if (!(TT.size&31)) TT.nv = xrealloc(TT.nv, (TT.size+32)*2*sizeof(char *));
 
-- 
2.12.1.500.gab5fba24ee-goog

_______________________________________________
Toybox mailing list
Toybox@lists.landley.net
http://lists.landley.net/listinfo.cgi/toybox-landley.net

Reply via email to