am 153c7aab: am 5eedd9d6: Merge "toolbox: fix build"

* commit '153c7aabdc1de609188ce2441442f985f75d4399':
  toolbox: fix build
This commit is contained in:
Greg Hackmann 2014-05-21 17:49:28 +00:00 committed by Android Git Automerger
commit 5d93823e55
2 changed files with 3 additions and 3 deletions

View file

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

View file

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