diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-05-21 17:43:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-21 17:43:10 +0000 |
| commit | 5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3 (patch) | |
| tree | 04b5aada5c6629451f5856aabf5068dac8ec832c | |
| parent | 08c08f72617b13696049bf295646d6a68f3f1a8c (diff) | |
| parent | eeed45fa24f3bc3046f352bf9788061715b44dcf (diff) | |
| download | system_core-5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3.zip system_core-5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3.tar.gz system_core-5eedd9d62fa30de15f7f6e3c04548d5e9b366ab3.tar.bz2 | |
Merge "toolbox: fix build"
| -rw-r--r-- | toolbox/insmod.c | 2 | ||||
| -rw-r--r-- | toolbox/watchprops.c | 4 |
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 = '.'; } |