summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2012-05-01 20:30:02 +0000
committerDmitry V. Levin <ldv@altlinux.org>2012-05-01 20:30:02 +0000
commit043b5f81429412cf23d578d1dc2b45107a8352e5 (patch)
tree220eb3c87aac86fc51df80052d4ae7acc4762387
parent3efa7c7f1be0f54e0656de5cb4a5f4c39db10150 (diff)
downloadstrace-043b5f81429412cf23d578d1dc2b45107a8352e5.tar.gz
strace-043b5f81429412cf23d578d1dc2b45107a8352e5.tar.bz2
strace-043b5f81429412cf23d578d1dc2b45107a8352e5.tar.xz
Remove recently introduced use of ULONG_MAX
* io.c: Remove limits.h inclusion. (tprint_iov): Use "(unsigned long) -1L" instead of "ULONG_MAX". * net.c: Remove limits.h inclusion. (printmmsghdr, sys_sendmsg): Use "(unsigned long) -1L" instead of "ULONG_MAX".
-rw-r--r--io.c3
-rw-r--r--net.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/io.c b/io.c
index bf5baa2..6b3f4b7 100644
--- a/io.c
+++ b/io.c
@@ -30,7 +30,6 @@
#include "defs.h"
#include <fcntl.h>
-#include <limits.h>
#if HAVE_SYS_UIO_H
# include <sys/uio.h>
#endif
@@ -143,7 +142,7 @@ tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr, int deco
void
tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov)
{
- tprint_iov_upto(tcp, len, addr, decode_iov, ULONG_MAX);
+ tprint_iov_upto(tcp, len, addr, decode_iov, (unsigned long) -1L);
}
int
diff --git a/net.c b/net.c
index fba521b..050b746 100644
--- a/net.c
+++ b/net.c
@@ -29,7 +29,6 @@
*/
#include "defs.h"
-#include <limits.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/un.h>
@@ -1455,7 +1454,7 @@ printmmsghdr(struct tcb *tcp, long addr, unsigned int idx)
return;
}
tprints("{");
- do_msghdr(tcp, &mmsg.msg_hdr, ULONG_MAX);
+ do_msghdr(tcp, &mmsg.msg_hdr, (unsigned long) -1L);
tprintf(", %u}", mmsg.msg_len);
}
@@ -1639,7 +1638,7 @@ sys_sendmsg(struct tcb *tcp)
{
if (entering(tcp)) {
tprintf("%ld, ", tcp->u_arg[0]);
- printmsghdr(tcp, tcp->u_arg[1], ULONG_MAX);
+ printmsghdr(tcp, tcp->u_arg[1], (unsigned long) -1L);
/* flags */
tprints(", ");
printflags(msg_flags, tcp->u_arg[2], "MSG_???");