[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=37810

User: gerald
Date: 2011/06/27 04:17 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r37236 | guy | 2011-05-18 00:20:45 -0700 (Wed, 18 May 2011) | 3 lines
   Changed paths:
      M /trunk/epan/proto.c
 
   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.
   ------------------------------------------------------------------------
   r37761 | stig | 2011-06-23 03:43:49 -0700 (Thu, 23 Jun 2011) | 5 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_tvb.c
 
   Rename Tvb_new_real to ByteArray_tvb, as it's a ByteArray function.
   Documentation is generated from code.
 
   This fixes bug 5199.
   ------------------------------------------------------------------------
   r37763 | stig | 2011-06-23 04:06:34 -0700 (Thu, 23 Jun 2011) | 4 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_tvb.c
 
   From Tony Trinh via bug 5960:
   Fix TvbRange:string() so that it returns a string that contains all bytes
   of the range, including zeroes (instead of being truncated at first zero).
   ------------------------------------------------------------------------
   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:
   ------------------------------------------------------------------------
   r37760 | stig | 2011-06-23 03:28:53 -0700 (Thu, 23 Jun 2011) | 5 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_tvb.c
 
   Rename Tvb_tvb to TvbRange_tvb, as it's a TvbRange function.
   Documentation is generated from code.
 
   This fixes bug 5006.
   ------------------------------------------------------------------------
   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.2/docbook/
  Changes    Path                 Action
  +48 -0     release-notes.xml    Modified

Directory: /trunk-1.2/epan/
  Changes    Path          Action
  +6 -1      proto.c       Modified
  +25 -14    range.c       Modified

Directory: /trunk-1.2/epan/wslua/
  Changes    Path             Action
  +94 -50    wslua_gui.c      Modified
  +192 -182  wslua_proto.c    Modified
  +9 -11     wslua_tvb.c      Modified