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 /smbutil.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 'smbutil.c')
-rw-r--r-- | smbutil.c | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -388,7 +388,7 @@ unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1], } } if (!use_unicode) { - while (strsize != 0) { + while (strsize != 0) { c = GET_U_1(s); s++; strsize--; @@ -768,9 +768,8 @@ smb_fdata1(netdissect_options *ndo, case 'T': { time_t t; - struct tm *lt; const char *tstring; - char buffer[sizeof("Www Mmm dd hh:mm:ss yyyy\n")]; + char buffer[sizeof("Www Mmm dd hh:mm:ss yyyyy")]; uint32_t x; switch (atoi(fmt + 1)) { @@ -800,16 +799,11 @@ smb_fdata1(netdissect_options *ndo, break; } if (t != 0) { - lt = localtime(&t); - if (lt != NULL) { - strftime(buffer, sizeof(buffer), "%a %b %e %T %Y%n", lt); - tstring = buffer; - } - else - tstring = "(Can't convert time)\n"; + tstring = nd_format_time(buffer, sizeof(buffer), "%a %b %e %T %Y", + localtime(&t)); } else - tstring = "NULL\n"; - ND_PRINT("%s", tstring); + tstring = "NULL"; + ND_PRINT("%s\n", tstring); fmt++; while (ND_ASCII_ISDIGIT(*fmt)) fmt++; |