gwj / at91sam9263 · Commits

Commit 1c5bf3bf8ce43924663e58f1c92708ac3e59272a

Authored by j_mayer
1 parent e96efcfc

Fix incorrect pointers casts. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2662 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 9 additions and 9 deletions
linux-user/syscall.c
  View file @1c5bf3b
... ... @@ -3345,7 +3345,7 @@ long do_syscall(void *cpu_env, int num, long arg1, long arg2, long arg3,
3345 3345 strncpy(tde->d_name, de->d_name, tnamelen);
3346 3346 de = (struct dirent *)((char *)de + reclen);
3347 3347 len -= reclen;
3348   - tde = (struct dirent *)((char *)tde + treclen);
  3348 + tde = (struct target_dirent *)((char *)tde + treclen);
3349 3349 count1 += treclen;
3350 3350 }
3351 3351 ret = count1;
... ...
monitor.c
  View file @1c5bf3b
... ... @@ -2116,9 +2116,9 @@ static void monitor_handle_command(const char *cmdline)
2116 2116 }
2117 2117 if (nb_args + 3 > MAX_ARGS)
2118 2118 goto error_args;
2119   - args[nb_args++] = (void*)count;
2120   - args[nb_args++] = (void*)format;
2121   - args[nb_args++] = (void*)size;
  2119 + args[nb_args++] = (void*)(long)count;
  2120 + args[nb_args++] = (void*)(long)format;
  2121 + args[nb_args++] = (void*)(long)size;
2122 2122 }
2123 2123 break;
2124 2124 case 'i':
... ... @@ -2146,7 +2146,7 @@ static void monitor_handle_command(const char *cmdline)
2146 2146 typestr++;
2147 2147 if (nb_args >= MAX_ARGS)
2148 2148 goto error_args;
2149   - args[nb_args++] = (void *)has_arg;
  2149 + args[nb_args++] = (void *)(long)has_arg;
2150 2150 if (!has_arg) {
2151 2151 if (nb_args >= MAX_ARGS)
2152 2152 goto error_args;
... ... @@ -2160,16 +2160,16 @@ static void monitor_handle_command(const char *cmdline)
2160 2160 if (c == 'i') {
2161 2161 if (nb_args >= MAX_ARGS)
2162 2162 goto error_args;
2163   - args[nb_args++] = (void *)(int)val;
  2163 + args[nb_args++] = (void *)(long)val;
2164 2164 } else {
2165 2165 if ((nb_args + 1) >= MAX_ARGS)
2166 2166 goto error_args;
2167 2167 #if TARGET_LONG_BITS == 64
2168   - args[nb_args++] = (void *)(int)((val >> 32) & 0xffffffff);
  2168 + args[nb_args++] = (void *)(long)((val >> 32) & 0xffffffff);
2169 2169 #else
2170 2170 args[nb_args++] = (void *)0;
2171 2171 #endif
2172   - args[nb_args++] = (void *)(int)(val & 0xffffffff);
  2172 + args[nb_args++] = (void *)(long)(val & 0xffffffff);
2173 2173 }
2174 2174 }
2175 2175 break;
... ... @@ -2196,7 +2196,7 @@ static void monitor_handle_command(const char *cmdline)
2196 2196 }
2197 2197 if (nb_args >= MAX_ARGS)
2198 2198 goto error_args;
2199   - args[nb_args++] = (void *)has_option;
  2199 + args[nb_args++] = (void *)(long)has_option;
2200 2200 }
2201 2201 break;
2202 2202 default:
... ...