commit 5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3
author Greg Hackmann <ghackmann@google.com> Wed May 21 17:43:09 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 21 17:43:10 2014 +0000
tree 04b5aada5c6629451f5856aabf5068dac8ec832c
parent 08c08f72617b13696049bf295646d6a68f3f1a8c
parent eeed45fa24f3bc3046f352bf9788061715b44dcf

Merge "toolbox: fix build"

toolbox/insmod.c

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 @@
 		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++ = ' ';

toolbox/watchprops.c

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 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 = '.';
     }