summaryrefslogtreecommitdiffstats
path: root/toolbox
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-05-21 10:39:44 -0700
committerGreg Hackmann <ghackmann@google.com>2014-05-21 10:39:44 -0700
commiteeed45fa24f3bc3046f352bf9788061715b44dcf (patch)
tree77aec5302d1895d441e5c7e3235d1f6dee414f26 /toolbox
parent36ccca155c03053397b953e4cc0ed8a8338d2450 (diff)
downloadsystem_core-eeed45fa24f3bc3046f352bf9788061715b44dcf.zip
system_core-eeed45fa24f3bc3046f352bf9788061715b44dcf.tar.gz
system_core-eeed45fa24f3bc3046f352bf9788061715b44dcf.tar.bz2
toolbox: fix build
Change-Id: I4d37ae4ad19620f77e37b739fb1248b712b3f986 Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/insmod.c2
-rw-r--r--toolbox/watchprops.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/toolbox/insmod.c b/toolbox/insmod.c
index fb1448b..d252433 100644
--- a/toolbox/insmod.c
+++ b/toolbox/insmod.c
@@ -73,7 +73,7 @@ int insmod_main(int argc, char **argv)
char *ptr = opts;
for (i = 2; (i < argc) && (ptr < end); i++) {
- len = MIN(strlen(argv[i]), end - ptr);
+ len = MIN(strlen(argv[i]), (size_t)(end - ptr));
memcpy(ptr, argv[i], len);
ptr += len;
*ptr++ = ' ';
diff --git a/toolbox/watchprops.c b/toolbox/watchprops.c
index 9921dbc..06cdebe 100644
--- a/toolbox/watchprops.c
+++ b/toolbox/watchprops.c
@@ -23,9 +23,9 @@ static bool str_equals(void *keyA, void *keyB)
static void announce(char *name, char *value)
{
- char *x;
+ unsigned char *x;
- for(x = value; *x; x++) {
+ for(x = (unsigned char *)value; *x; x++) {
if((*x < 32) || (*x > 127)) *x = '.';
}