diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-05-21 18:10:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 18:10:38 +0000 |
| commit | 4dc379b59bcb60ff17501c2b7f3180fc0f6cdb61 (patch) | |
| tree | 5c4170a16087e007563187e0ed7d6abe5c283888 /toolbox | |
| parent | f76d8a88a1477680aca6eca14c699e7fd41832c3 (diff) | |
| parent | 5d93823e557834c9b17771241ea6eecad74a5749 (diff) | |
| download | core-4dc379b59bcb60ff17501c2b7f3180fc0f6cdb61.tar.gz core-4dc379b59bcb60ff17501c2b7f3180fc0f6cdb61.tar.bz2 core-4dc379b59bcb60ff17501c2b7f3180fc0f6cdb61.zip | |
am 5d93823e: am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"
* commit '5d93823e557834c9b17771241ea6eecad74a5749':
toolbox: fix build
Diffstat (limited to 'toolbox')
| -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 fb1448ba5..d252433bf 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 9921dbcdb..06cdebec3 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 = '.'; } |