diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2023-07-12 23:50:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-12 23:50:22 +0000 |
| commit | 86a2c2f7a53c67bc6cbbadd03d25cf3a79a60ed2 (patch) | |
| tree | 459101553d2b7814467ff205890774b31912033c /print-arista.c | |
| parent | bc66278394fe60f4893d1b443a0a26ba08f0880a (diff) | |
| parent | 79017393c7e63fb21830154d21c77e4480b44a96 (diff) | |
| download | tcpdump-86a2c2f7a53c67bc6cbbadd03d25cf3a79a60ed2.tar.gz | |
Merge "Upgrade tcpdump to tcpdump-4.99.4" into main am: d231da0df5 am: 79017393c7
Original change: https://android-review.googlesource.com/c/platform/external/tcpdump/+/2655820
Change-Id: I1b925a33b26b5d6d1dc388d1ae0bf6f8cba1526b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'print-arista.c')
| -rw-r--r-- | print-arista.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/print-arista.c b/print-arista.c index 039a1ffd..079ad684 100644 --- a/print-arista.c +++ b/print-arista.c @@ -10,7 +10,6 @@ #include "netdissect.h" #include "extract.h" -#include "addrtoname.h" /* @@ -93,17 +92,13 @@ arista_print_date_hms_time(netdissect_options *ndo, uint32_t seconds, uint32_t nanoseconds) { time_t ts; - struct tm *tm; - char buf[BUFSIZE]; + char buf[sizeof("-yyyyyyyyyy-mm-dd hh:mm:ss")]; ts = seconds + (nanoseconds / 1000000000); nanoseconds %= 1000000000; - if (NULL == (tm = gmtime(&ts))) - ND_PRINT("gmtime() error"); - else if (0 == strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm)) - ND_PRINT("strftime() error"); - else - ND_PRINT("%s.%09u", buf, nanoseconds); + ND_PRINT("%s.%09u", + nd_format_time(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", + gmtime(&ts)), nanoseconds); } int |