Remove code which supports systems with long long off_t.

[strace] / bjm.c

diff --git a/bjm.c b/bjm.c
index b5e21f9952c9af536a29c25b033fa8f22ca77ea5..364dca7187d87e2b214c016bc4faa05583839763 100644 (file)
--- a/bjm.c
+++ b/bjm.c
@@ -26,11 +26,9 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *     $Id$
  */
-#include "defs.h"
 
+#include "defs.h"
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -117,7 +115,7 @@ sys_query_module(struct tcb *tcp)
                                printflags(modflags, mi.flags, "MOD_???");
                                tprintf(", usecount=%lu}, ", mi.usecount);
                        }
-                       tprintf("%Zu", ret);
+                       tprintf("%lu", (unsigned long)ret);
                } else if ((tcp->u_arg[1]==QM_MODULES) ||
                           (tcp->u_arg[1]==QM_DEPS) ||
                           (tcp->u_arg[1]==QM_REFS)) {
@@ -129,11 +127,11 @@ sys_query_module(struct tcb *tcp)
 
                                if (!data) {
                                        fprintf(stderr, "out of memory\n");
-                                       tprintf(" /* %Zu entries */ ", ret);
+                                       tprintf(" /* %lu entries */ ", (unsigned long)ret);
                                } else {
                                        if (umoven(tcp, tcp->u_arg[2],
                                                tcp->u_arg[3], data) < 0) {
-                                               tprintf(" /* %Zu entries */ ", ret);
+                                               tprintf(" /* %lu entries */ ", (unsigned long)ret);
                                        } else {
                                                for (idx = 0; idx < ret; idx++) {
                                                        tprintf("%s%s",
@@ -145,8 +143,8 @@ sys_query_module(struct tcb *tcp)
                                        free(data);
                                }
                        } else
-                               tprintf(" /* %Zu entries */ ", ret);
-                       tprintf("}, %Zu", ret);
+                               tprintf(" /* %lu entries */ ", (unsigned long)ret);
+                       tprintf("}, %lu", (unsigned long)ret);
                } else if (tcp->u_arg[1]==QM_SYMBOLS) {
                        tprints("{");
                        if (!abbrev(tcp)) {
@@ -156,11 +154,11 @@ sys_query_module(struct tcb *tcp)
 
                                if (!data) {
                                        fprintf(stderr, "out of memory\n");
-                                       tprintf(" /* %Zu entries */ ", ret);
+                                       tprintf(" /* %lu entries */ ", (unsigned long)ret);
                                } else {
                                        if (umoven(tcp, tcp->u_arg[2],
                                                tcp->u_arg[3], data) < 0) {
-                                               tprintf(" /* %Zu entries */ ", ret);
+                                               tprintf(" /* %lu entries */ ", (unsigned long)ret);
                                        } else {
                                                for (idx = 0; idx < ret; idx++) {
                                                        tprintf("%s{name=%s, value=%lu}",
@@ -173,8 +171,8 @@ sys_query_module(struct tcb *tcp)
                                        free(data);
                                }
                        } else
-                               tprintf(" /* %Zu entries */ ", ret);
-                       tprintf("}, %Zd", ret);
+                               tprintf(" /* %lu entries */ ", (unsigned long)ret);
+                       tprintf("}, %ld", (unsigned long)ret);
                } else {
                        printstr(tcp, tcp->u_arg[2], tcp->u_arg[3]);
                        tprintf(", %#lx", tcp->u_arg[4]);