diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | net.c | 7 | ||||
| -rw-r--r-- | system.c | 8 |
3 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2009-03-23 Denys Vlasenko <dvlasenk@redhat.com> + + * system.c (sram_alloc_flag): Add L2_SRAM constant. + by Mike Frysinger (vapier AT gentoo.org). + (sys_sram_alloc): Fix improperly used %zu: + tcp->u_arg is not a size_t, it is a long. + * net.c (printcmsghdr): Fix improperly used %zu: + struct cmsghdr::cmsg_len is not a size_t. + 2009-03-17 Denys Vlasenko <dvlasenk@redhat.com> * strace.c (collect_stopped_tcbs): Check for ^C here too, @@ -1110,10 +1110,7 @@ static const struct xlat scmvals[] = { }; static void -printcmsghdr(tcp, addr, len) -struct tcb *tcp; -unsigned long addr; -unsigned long len; +printcmsghdr(struct tcb *tcp, unsigned long addr, unsigned long len) { struct cmsghdr *cmsg = len < sizeof(struct cmsghdr) ? NULL : malloc(len); @@ -1123,7 +1120,7 @@ unsigned long len; return; } - tprintf(", {cmsg_len=%zu, cmsg_level=", cmsg->cmsg_len); + tprintf(", {cmsg_len=%u, cmsg_level=", (unsigned) cmsg->cmsg_len); printxval(socketlayers, cmsg->cmsg_level, "SOL_???"); tprintf(", cmsg_type="); @@ -302,18 +302,18 @@ static const struct xlat sram_alloc_flags[] = { { L1_DATA_A_SRAM, "L1_DATA_A_SRAM" }, { L1_DATA_B_SRAM, "L1_DATA_B_SRAM" }, { L1_DATA_SRAM, "L1_DATA_SRAM" }, + { L2_SRAM, "L2_SRAM" }, { 0, NULL }, }; int -sys_sram_alloc(tcp) -struct tcb *tcp; +sys_sram_alloc(struct tcb *tcp) { if (entering(tcp)) { /* size */ - tprintf("%zu, ", tcp->u_arg[0]); + tprintf("%lu, ", tcp->u_arg[0]); /* flags */ - printxval(sram_alloc_flags, tcp->u_arg[1], "L1_???_SRAM"); + printxval(sram_alloc_flags, tcp->u_arg[1], "???_SRAM"); } return 1; } |