addflags: change type of integer argument to uint64_t

This is necessary for the upcoming change of xlat.val type.
All users of addflags are already prepared for this change.

* defs.h (addflags): Change type of integer argument to uint64_t.
* util.c (addflags): Likewise.  Print it using PRIx64 format.
Based on patch by Jeff Mahoney <jeffm@suse.com>.

diff --git a/defs.h b/defs.h
index 2cd239794669a0117f970e9e63f4aaa05789721c..1423770fe77631280ab2065d2e081bd2534d4ea9 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -555,7 +555,7 @@ extern int printargs(struct tcb *);
 extern int printargs_u(struct tcb *);
 extern int printargs_d(struct tcb *);
 
-extern void addflags(const struct xlat *, int);
+extern void addflags(const struct xlat *, uint64_t);
 extern int printflags(const struct xlat *, int, const char *);
 extern const char *sprintflags(const char *, const struct xlat *, int);
 extern const char *sprintmode(int);

diff --git a/util.c b/util.c
index 1e5aecc1f4f72a9773fbb94df68cc86e062c0490..763fd112d3e88aed3cce17ed40233cbbdd91f6f1 100644 (file)
--- a/util.c
+++ b/util.c
@@ -303,7 +303,7 @@ printllval(struct tcb *tcp, const char *format, int arg_no)
  * return # of flags printed.
  */
 void
-addflags(const struct xlat *xlat, int flags)
+addflags(const struct xlat *xlat, uint64_t flags)
 {
        for (; xlat->str; xlat++) {
                if (xlat->val && (flags & xlat->val) == xlat->val) {
@@ -312,7 +312,7 @@ addflags(const struct xlat *xlat, int flags)
                }
        }
        if (flags) {
-               tprintf("|%#x", flags);
+               tprintf("|%#" PRIx64, flags);
        }
 }