diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-03-09 15:29:21 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-03-09 23:30:22 +0000 |
| commit | 4273d0b170033848df7ad0cfe9934320390af85e (patch) | |
| tree | 543a834d92308b3ea65196d9e7d1643b72ebff72 | |
| parent | e451ea0a4d0788de2179a14682b5ceb2ced1c83d (diff) | |
Allow %D and %T in date/time formats.
1) They're both required, for both strftime() and strptime(), by the
Single UNIX Specification.
2) They're both supported by MSVC's strftime(), at least as of VS 2015.
3) With MSVC, we use our own strptime(), which is based on the GNU libc
one and which supports both of them.
So we don't have to worry about them not working and either giving a
bogus value or throwing an exception or anything such as that.
Bug: 15565
Change-Id: I72b7798f35c4461855298cfcfa84732c1297d5fe
Reviewed-on: https://code.wireshark.org/review/32370
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | ui/qt/import_text_dialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/import_text_dialog.cpp b/ui/qt/import_text_dialog.cpp index 4ae48741bd..68a85b124f 100644 --- a/ui/qt/import_text_dialog.cpp +++ b/ui/qt/import_text_dialog.cpp @@ -355,7 +355,7 @@ void ImportTextDialog::on_encapComboBox_currentIndexChanged(int index) bool ImportTextDialog::checkDateTimeFormat(const QString &time_format) { - const QString valid_code = "aAbBcdHIjmMpSUwWxXyYzZ%"; + const QString valid_code = "aAbBcdDHIjmMpSTUwWxXyYzZ%"; int idx = 0; while ((idx = time_format.indexOf("%", idx)) != -1) { |