instrument functions: Use an environment variable instead of config files

[tcpdump] / smbutil.c

diff --git a/smbutil.c b/smbutil.c
index ff32ecce2ba43a5a12159ed3d27610654a006feb..97217a8d9fc6a8a4def9fbd160b9217e37cd2d92 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -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,8 +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 yyyyy")];
            uint32_t x;
 
            switch (atoi(fmt + 1)) {
@@ -799,14 +799,11 @@ smb_fdata1(netdissect_options *ndo,
                break;
            }
            if (t != 0) {
-               lt = localtime(&t);
-               if (lt != NULL)
-                   tstring = asctime(lt);
-               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++;