http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=38020
User: gerald
Date: 2011/07/14 10:50 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r37780 | cmaynard | 2011-06-23 19:45:23 -0700 (Thu, 23 Jun 2011) | 2 lines
Changed paths:
M /trunk/tap-comparestat.c
Print the filter string, if one was specified, just like Wireshark does.
------------------------------------------------------------------------
r37783 | stig | 2011-06-25 07:58:06 -0700 (Sat, 25 Jun 2011) | 8 lines
Changed paths:
M /trunk/epan/proto.c
Make guy's fix in revision 37236 actually work:
"You cannot just make the "len" field of a GByteArray larger, if there's
no data to back that length; you can only make it smaller."
Two equal values are always equal!
This fixes bug 5941.
------------------------------------------------------------------------
r37785 | stig | 2011-06-25 08:24:55 -0700 (Sat, 25 Jun 2011) | 3 lines
Changed paths:
M /trunk/epan/wslua/wslua_proto.c
From Tony Trinh via bug 5894:
Added argument validation to Pref.range.
------------------------------------------------------------------------
r37786 | stig | 2011-06-25 08:42:41 -0700 (Sat, 25 Jun 2011) | 5 lines
Changed paths:
M /trunk/epan/wslua/wslua_proto.c
Remove "range" from Lua's Pref.range(), as this value shall be fetched from
the "default".
This fixes bug 5896.
------------------------------------------------------------------------
Copy over by hand:
------------------------------------------------------------------------
r37779 | cmaynard | 2011-06-23 19:35:46 -0700 (Thu, 23 Jun 2011) | 6 lines
Changed paths:
M /trunk/gtk/main.c
Make Wireshark portable to all locales by calling setlocale(). This, along with my previous commits in revisions 36160 and 36166 ought to fix the problem that Bartosz Kiziukiewicz first reported on the wireshark-users mailing list here:
http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html
(I successfully generated Wireshark compare statistics after applying this change and also changing my locale to Polish.)
------------------------------------------------------------------------
r37784 | stig | 2011-06-25 08:21:17 -0700 (Sat, 25 Jun 2011) | 3 lines
Changed paths:
M /trunk/epan/range.c
From Tony Trinh via bug 5895:
Add sanity checks in range.c
------------------------------------------------------------------------
r37787 | stig | 2011-06-25 12:39:16 -0700 (Sat, 25 Jun 2011) | 4 lines
Changed paths:
M /trunk/epan/wslua/wslua_proto.c
Added check for invalid chars in abbrev in ProtoField functions.
This fixes bug 5569.
------------------------------------------------------------------------
r37788 | stig | 2011-06-25 13:47:13 -0700 (Sat, 25 Jun 2011) | 6 lines
Changed paths:
M /trunk/epan/wslua/wslua_gui.c
From Tony Trinh via bug 6018:
Add NULL checks and fix typos in Lua error print-outs
From me:
Use the error message "GUI not available" when using GUI functions in tshark.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.4/docbook/
Changes Path Action
+30 -0 release-notes.xml Modified
Directory: /trunk-1.4/epan/
Changes Path Action
+1 -1 proto.c Modified
+25 -13 range.c Modified
Directory: /trunk-1.4/gtk/
Changes Path Action
+3 -0 main.c Modified
Directory: /trunk-1.4/
Changes Path Action
+1 -1 tap-comparestat.c Modified
Directory: /trunk-1.4/epan/wslua/
Changes Path Action
+94 -50 wslua_gui.c Modified
+46 -27 wslua_proto.c Modified