diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-23 14:32:34 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-23 14:32:34 +0000 |
| commit | 48751ab095bbbb23489c2e3243f57571cbfa9153 (patch) | |
| tree | 7a15647c01c3acdb2d1c61142bb13616ad03a2aa /cpukit/libmisc/shell/main_mwdump.c | |
| parent | 2009-07-23 Santosh G Vattam <vattam.santosh@gmail.com> (diff) | |
| download | rtems-48751ab095bbbb23489c2e3243f57571cbfa9153.tar.bz2 | |
2009-07-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/Makefile.am, libmisc/shell/main_chmod.c,
libmisc/shell/main_mdump.c, libmisc/shell/main_medit.c,
libmisc/shell/main_mfill.c, libmisc/shell/main_mmove.c,
libmisc/shell/main_msdosfmt.c, libmisc/shell/main_mwdump.c,
libmisc/shell/main_sleep.c, libmisc/shell/main_umask.c,
libmisc/shell/shell_script.c, libmisc/stringto/stringto.h,
libmisc/stringto/stringto_template.h: Convert return type from bool
to rtems_status_code and add rtems_string_to_pointer. Perform
associated clean up and changes for return type change.
* libmisc/stringto/stringtopointer.c: New file.
Diffstat (limited to 'cpukit/libmisc/shell/main_mwdump.c')
| -rw-r--r-- | cpukit/libmisc/shell/main_mwdump.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cpukit/libmisc/shell/main_mwdump.c b/cpukit/libmisc/shell/main_mwdump.c index 6c6c77dcc0..9520f1e773 100644 --- a/cpukit/libmisc/shell/main_mwdump.c +++ b/cpukit/libmisc/shell/main_mwdump.c @@ -31,24 +31,22 @@ int rtems_shell_main_mwdump( char *argv[] ) { - unsigned long tmp; unsigned char n; unsigned char m; int max; int res; - uintptr_t addr = 0; + void *addr = 0; unsigned char *pb; if ( argc > 1 ) { - if ( !rtems_string_to_unsigned_long(argv[1], &tmp, NULL, 0) ) { + if ( rtems_string_to_pointer(argv[1], &addr, NULL) ) { printf( "Address argument (%s) is not a number\n", argv[1] ); return -1; } - addr = (uintptr_t) tmp; } if ( argc > 2 ) { - if ( !rtems_string_to_int(argv[2], &max, NULL, 0) ) { + if ( rtems_string_to_int(argv[2], &max, NULL, 0) ) { printf( "Address argument (%s) is not a number\n", argv[1] ); return -1; } @@ -71,8 +69,8 @@ int rtems_shell_main_mwdump( res = 0xf; } + pb = addr; for (m=0;m<max;m++) { - pb = (unsigned char *) addr; printf("%10p ", pb); for (n=0;n<=(m==(max-1)?res:0xf);n+=2) printf("%04X%c",*((unsigned short*)(pb+n)),n==6?'-':' '); @@ -82,7 +80,7 @@ int rtems_shell_main_mwdump( printf("%c", isprint(pb[n]) ? pb[n] : '.'); } printf("\n"); - addr += 16; + pb += 16; } return 0; } |