------------------------------------------------------------
revno: 13135
revision-id: squid3@treenet.co.nz-20140514153648-9g1f2aaqngxdqbh5
parent: squidadm@squid-cache.org-20140508001803-oinopeug7zei3e0q
author: Steve Hill <steve@opendium.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Wed 2014-05-14 09:36:48 -0600
message:
  Regression: segfault logging with %tg format specifier
  
  In rev.13132 Token class data member was converted from union to
  struct without adding initializer for the timespec field.
  
  timespec is a redundant field anyway, just remove it.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140514153648-9g1f2aaqngxdqbh5
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: cf076d1ce97f8c29410e17fdc41067f098b19221
# timestamp: 2014-05-14 15:38:01 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squidadm@squid-cache.org-20140508001803-\
#   oinopeug7zei3e0q
# 
# Begin patch
=== modified file 'src/format/Format.cc'
--- src/format/Format.cc	2014-05-02 07:51:33 +0000
+++ src/format/Format.cc	2014-05-14 15:36:48 +0000
@@ -475,7 +475,7 @@
             const char *spec;
 
             struct tm *t;
-            spec = fmt->data.timespec;
+            spec = fmt->data.string;
 
             if (fmt->type == LFT_TIME_LOCALTIME) {
                 if (!spec)

=== modified file 'src/format/Token.h'
--- src/format/Token.h	2014-05-02 07:51:33 +0000
+++ src/format/Token.h	2014-05-14 15:36:48 +0000
@@ -49,7 +49,6 @@
             char *element;
             char separator;
         } header;
-        char *timespec;
     } data;
     int widthMin; ///< minimum field width
     int widthMax; ///< maximum field width