diff options
| -rw-r--r-- | lib/thread.c | 7 | ||||
| -rw-r--r-- | pbrd/pbr_zebra.c | 7 | ||||
| -rw-r--r-- | zebra/kernel_socket.c | 10 |
3 files changed, 13 insertions, 11 deletions
diff --git a/lib/thread.c b/lib/thread.c index 19ab409439..608c236f4c 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -93,10 +93,9 @@ static void cpu_record_hash_free(void *a) static void vty_out_cpu_thread_history(struct vty *vty, struct cpu_thread_history *a) { - vty_out(vty, "%5"PRIdFAST32" %10lu.%03lu %9"PRIuFAST32 - " %8lu %9lu %8lu %9lu", a->total_active, - a->cpu.total / 1000, a->cpu.total % 1000, a->total_calls, - a->cpu.total / a->total_calls, a->cpu.max, + vty_out(vty, "%5zu %10zu.%03lu %9zu %8zu %9zu %8lu %9lu", + a->total_active, a->cpu.total / 1000, a->cpu.total % 1000, + a->total_calls, a->cpu.total / a->total_calls, a->cpu.max, a->real.total / a->total_calls, a->real.max); vty_out(vty, " %c%c%c%c%c %s\n", a->types & (1 << THREAD_READ) ? 'R' : ' ', diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c index 44c8daa97b..4f8f50556b 100644 --- a/pbrd/pbr_zebra.c +++ b/pbrd/pbr_zebra.c @@ -240,18 +240,19 @@ static int rule_notify_owner(int command, struct zclient *zclient, switch (note) { case ZAPI_RULE_FAIL_INSTALL: pbrms->installed &= ~installed; - DEBUGD(&pbr_dbg_zebra, "%s: Received RULE_FAIL_INSTALL: %lu", + DEBUGD(&pbr_dbg_zebra, + "%s: Received RULE_FAIL_INSTALL: %" PRIu64, __PRETTY_FUNCTION__, pbrms->installed); break; case ZAPI_RULE_INSTALLED: pbrms->installed |= installed; - DEBUGD(&pbr_dbg_zebra, "%s: Received RULE_INSTALLED: %lu", + DEBUGD(&pbr_dbg_zebra, "%s: Received RULE_INSTALLED: %" PRIu64, __PRETTY_FUNCTION__, pbrms->installed); break; case ZAPI_RULE_FAIL_REMOVE: case ZAPI_RULE_REMOVED: pbrms->installed &= ~installed; - DEBUGD(&pbr_dbg_zebra, "%s: Received RULE REMOVED: %lu", + DEBUGD(&pbr_dbg_zebra, "%s: Received RULE REMOVED: %" PRIu64, __PRETTY_FUNCTION__, pbrms->installed); break; } diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 1bbb98ad19..13d2185b0f 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -280,8 +280,9 @@ size_t _rta_get(caddr_t sap, void *destp, size_t destlen, bool checkaf) } if (copylen > destlen) { - zlog_warn("%s: destination buffer too small (%lu vs %lu)", - __func__, copylen, destlen); + zlog_warn( + "%s: destination buffer too small (%zu vs %zu)", + __func__, copylen, destlen); memcpy(dest, sap, destlen); } else memcpy(dest, sap, copylen); @@ -316,8 +317,9 @@ size_t rta_getsdlname(caddr_t sap, void *destp, short *destlen) if (copylen > 0 && dest != NULL && sdl->sdl_family == AF_LINK) { if (copylen > IFNAMSIZ) { - zlog_warn("%s: destination buffer too small (%lu vs %d)", - __func__, copylen, IFNAMSIZ); + zlog_warn( + "%s: destination buffer too small (%zu vs %d)", + __func__, copylen, IFNAMSIZ); memcpy(dest, sdl->sdl_data, IFNAMSIZ); dest[IFNAMSIZ] = 0; *destlen = IFNAMSIZ; |