glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Assume "long long" availability

Browse Source 
Most of the code already uses long long types unconditionally.

* configure.ac: Remove the check for long long.
* file.c (printstat64): Remove HAVE_LONG_LONG checks, use %llu format
string unconditionally.
This commit is contained in:
Дмитрий Левин 2013-11-11 15:52:37 +00:00
parent d64a7e4755
commit 18bce8c23a
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -193,7 +193,6 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
[#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>])
AC_CHECK_TYPES([long long])
AC_LITTLE_ENDIAN_LONG_LONG
AC_OFF_T_IS_LONG_LONG
AC_CHECK_TYPES([struct opthdr],,, [#include <sys/socket.h>])

12
file.c
View File

@ -1104,18 +1104,10 @@ printstat64(struct tcb *tcp, long addr)
}
if (!abbrev(tcp)) {
#ifdef HAVE_LONG_LONG
tprintf("{st_dev=makedev(%lu, %lu), st_ino=%llu, st_mode=%s, ",
#else
tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
#endif
(unsigned long) major(statbuf.st_dev),
(unsigned long) minor(statbuf.st_dev),
#ifdef HAVE_LONG_LONG
(unsigned long long) statbuf.st_ino,
#else
(unsigned long) statbuf.st_ino,
#endif
sprintmode(statbuf.st_mode));
tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
(unsigned long) statbuf.st_nlink,
@ -1144,11 +1136,7 @@ printstat64(struct tcb *tcp, long addr)
#endif /* !HAVE_STRUCT_STAT_ST_RDEV */
break;
default:
#ifdef HAVE_LONG_LONG
tprintf("st_size=%llu, ", (unsigned long long) statbuf.st_size);
#else
tprintf("st_size=%lu, ", (unsigned long) statbuf.st_size);
#endif
break;
}
if (!abbrev(tcp)) {