diff options
author | Petr Machata <pmachata@redhat.com> | 2012-01-06 15:40:33 +0100 |
---|---|---|
committer | Petr Machata <pmachata@redhat.com> | 2012-08-29 19:02:06 +0200 |
commit | 46a41f7c72828f2f43a640e0ce1fbb41d7a196e9 (patch) | |
tree | 63a1a0ca193e81b99e40c0df32992db9f6d315b7 /sysdeps/linux-gnu/trace.c | |
parent | 77d2137b1f1db9c3a0c7090dee882e0e17984350 (diff) | |
download | ltrace-46a41f7c72828f2f43a640e0ce1fbb41d7a196e9.tar.gz |
Drop umovestr, umovelong that are not used anymore
Diffstat (limited to 'sysdeps/linux-gnu/trace.c')
-rw-r--r-- | sysdeps/linux-gnu/trace.c | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/sysdeps/linux-gnu/trace.c b/sysdeps/linux-gnu/trace.c index f573f22..f25fabc 100644 --- a/sysdeps/linux-gnu/trace.c +++ b/sysdeps/linux-gnu/trace.c @@ -48,37 +48,6 @@ #endif /* PTRACE_EVENT_FORK */ -#ifdef ARCH_HAVE_UMOVELONG -extern int arch_umovelong (Process *, void *, long *, arg_type_info *); -int -umovelong(Process *proc, void *addr, long *result, arg_type_info *info) { - return arch_umovelong (proc, addr, result, info); -} -#else -/* Read a single long from the process's memory address 'addr' */ -int -umovelong(Process *proc, void *addr, long *result, struct arg_type_info *info) -{ - long pointed_to; - - errno = 0; - pointed_to = ptrace (PTRACE_PEEKTEXT, proc->pid, addr, 0); - if (pointed_to == -1 && errno) - return -errno; - - *result = pointed_to; - if (info) { - switch (info->type) { - case ARGTYPE_INT: - *result &= 0x00000000ffffffffUL; - default: - break; - }; - } - return 0; -} -#endif - void trace_fail_warning(pid_t pid) { @@ -1235,32 +1204,3 @@ umovebytes(Process *proc, void *addr, void *laddr, size_t len) { return bytes_read; } - -/* Read a series of bytes starting at the process's memory address - 'addr' and continuing until a NUL ('\0') is seen or 'len' bytes - have been read. -*/ -int -umovestr(Process *proc, void *addr, int len, void *laddr) { - union { - long a; - char c[sizeof(long)]; - } a; - unsigned i; - int offset = 0; - - while (offset < len) { - a.a = ptrace(PTRACE_PEEKTEXT, proc->pid, addr + offset, 0); - for (i = 0; i < sizeof(long); i++) { - if (a.c[i] && offset + (signed)i < len) { - *(char *)(laddr + offset + i) = a.c[i]; - } else { - *(char *)(laddr + offset + i) = '\0'; - return 0; - } - } - offset += sizeof(long); - } - *(char *)(laddr + offset) = '\0'; - return 0; -} |