mirror of https://github.com/xemu-project/xemu.git
Fix incorrect pointers casts.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2662 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
e96efcfcb1
commit
1c5bf3bf8c
|
@ -3345,7 +3345,7 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
|
||||||
strncpy(tde->d_name, de->d_name, tnamelen);
|
strncpy(tde->d_name, de->d_name, tnamelen);
|
||||||
de = (struct dirent *)((char *)de + reclen);
|
de = (struct dirent *)((char *)de + reclen);
|
||||||
len -= reclen;
|
len -= reclen;
|
||||||
tde = (struct dirent *)((char *)tde + treclen);
|
tde = (struct target_dirent *)((char *)tde + treclen);
|
||||||
count1 += treclen;
|
count1 += treclen;
|
||||||
}
|
}
|
||||||
ret = count1;
|
ret = count1;
|
||||||
|
|
16
monitor.c
16
monitor.c
|
@ -2116,9 +2116,9 @@ static void monitor_handle_command(const char *cmdline)
|
||||||
}
|
}
|
||||||
if (nb_args + 3 > MAX_ARGS)
|
if (nb_args + 3 > MAX_ARGS)
|
||||||
goto error_args;
|
goto error_args;
|
||||||
args[nb_args++] = (void*)count;
|
args[nb_args++] = (void*)(long)count;
|
||||||
args[nb_args++] = (void*)format;
|
args[nb_args++] = (void*)(long)format;
|
||||||
args[nb_args++] = (void*)size;
|
args[nb_args++] = (void*)(long)size;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'i':
|
case 'i':
|
||||||
|
@ -2146,7 +2146,7 @@ static void monitor_handle_command(const char *cmdline)
|
||||||
typestr++;
|
typestr++;
|
||||||
if (nb_args >= MAX_ARGS)
|
if (nb_args >= MAX_ARGS)
|
||||||
goto error_args;
|
goto error_args;
|
||||||
args[nb_args++] = (void *)has_arg;
|
args[nb_args++] = (void *)(long)has_arg;
|
||||||
if (!has_arg) {
|
if (!has_arg) {
|
||||||
if (nb_args >= MAX_ARGS)
|
if (nb_args >= MAX_ARGS)
|
||||||
goto error_args;
|
goto error_args;
|
||||||
|
@ -2160,16 +2160,16 @@ static void monitor_handle_command(const char *cmdline)
|
||||||
if (c == 'i') {
|
if (c == 'i') {
|
||||||
if (nb_args >= MAX_ARGS)
|
if (nb_args >= MAX_ARGS)
|
||||||
goto error_args;
|
goto error_args;
|
||||||
args[nb_args++] = (void *)(int)val;
|
args[nb_args++] = (void *)(long)val;
|
||||||
} else {
|
} else {
|
||||||
if ((nb_args + 1) >= MAX_ARGS)
|
if ((nb_args + 1) >= MAX_ARGS)
|
||||||
goto error_args;
|
goto error_args;
|
||||||
#if TARGET_LONG_BITS == 64
|
#if TARGET_LONG_BITS == 64
|
||||||
args[nb_args++] = (void *)(int)((val >> 32) & 0xffffffff);
|
args[nb_args++] = (void *)(long)((val >> 32) & 0xffffffff);
|
||||||
#else
|
#else
|
||||||
args[nb_args++] = (void *)0;
|
args[nb_args++] = (void *)0;
|
||||||
#endif
|
#endif
|
||||||
args[nb_args++] = (void *)(int)(val & 0xffffffff);
|
args[nb_args++] = (void *)(long)(val & 0xffffffff);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -2196,7 +2196,7 @@ static void monitor_handle_command(const char *cmdline)
|
||||||
}
|
}
|
||||||
if (nb_args >= MAX_ARGS)
|
if (nb_args >= MAX_ARGS)
|
||||||
goto error_args;
|
goto error_args;
|
||||||
args[nb_args++] = (void *)has_option;
|
args[nb_args++] = (void *)(long)has_option;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue