]> granicus.if.org Git - strace/commitdiff
Remove unused functions
authorDmitry V. Levin <ldv@altlinux.org>
Sat, 7 May 2016 23:17:29 +0000 (23:17 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sat, 7 May 2016 23:37:53 +0000 (23:37 +0000)
* defs.h (umove_ulong_or_printaddr, umove_ulong_array_or_printaddr):
Remove.
* util.c (umove_ulong_or_printaddr, umove_ulong_array_or_printaddr):
Likewise.

defs.h
util.c

diff --git a/defs.h b/defs.h
index 97ac9736710d1ab6d0328739f86241a7e8ebb74d..8061047955f10d3cf1e407673e2c76f78a004fc3 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -510,8 +510,6 @@ extern int umoven(struct tcb *, long, unsigned int, void *);
 extern int umoven_or_printaddr(struct tcb *, long, unsigned int, void *);
 #define umove_or_printaddr(pid, addr, objp)    \
        umoven_or_printaddr((pid), (addr), sizeof(*(objp)), (void *) (objp))
-extern int umove_ulong_or_printaddr(struct tcb *, long, unsigned long *);
-extern int umove_ulong_array_or_printaddr(struct tcb *, long, unsigned long *, size_t);
 extern int umovestr(struct tcb *, long, unsigned int, char *);
 extern int upeek(int pid, long, long *);
 
diff --git a/util.c b/util.c
index 454c7cf619971a06c34786c13c51d43e98aabc7d..b0757a837219bf3c9b7e9518b54b22f45b2929d1 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1143,37 +1143,6 @@ umoven_or_printaddr(struct tcb *tcp, const long addr, const unsigned int len,
        return 0;
 }
 
-int
-umove_ulong_or_printaddr(struct tcb *tcp, const long addr, unsigned long *ptr)
-{
-       if (current_wordsize < sizeof(*ptr)) {
-               uint32_t val32;
-               int r = umove_or_printaddr(tcp, addr, &val32);
-               if (!r)
-                       *ptr = (unsigned long) val32;
-               return r;
-       }
-       return umove_or_printaddr(tcp, addr, ptr);
-}
-
-int
-umove_ulong_array_or_printaddr(struct tcb *tcp, const long addr,
-                              unsigned long *ptr, size_t n)
-{
-       if (current_wordsize < sizeof(*ptr)) {
-               uint32_t ptr32[n];
-               int r = umove_or_printaddr(tcp, addr, &ptr32);
-               if (!r) {
-                       size_t i;
-
-                       for (i = 0; i < n; ++i)
-                               ptr[i] = (unsigned long) ptr32[i];
-               }
-               return r;
-       }
-       return umoven_or_printaddr(tcp, addr, n * sizeof(*ptr), ptr);
-}
-
 /*
  * Like `umove' but make the additional effort of looking
  * for a terminating zero byte.