[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2010/06/06 06:59 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r32947 | jake | 2010-05-25 10:47:00 -0700 (Tue, 25 May 2010) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-bgp.h
 
 Fix for bug 4782:
 Use proper bitmask to test the "MATCH"-part.
 ------------------------------------------------------------------------
 r32956 | wmeier | 2010-05-25 15:27:00 -0700 (Tue, 25 May 2010) | 4 lines
 Changed paths:
    M /trunk/text2pcap-scanner.l
 
 Handle lines ending in \r\n.
 Fixes Bug #4780 
 See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4780
 ------------------------------------------------------------------------
 r32962 | guy | 2010-05-25 19:21:23 -0700 (Tue, 25 May 2010) | 3 lines
 Changed paths:
    M /trunk/doc/README.developer
 
 Put in a warning about the <stdarg.h> problem that I just found and
 fixed in one place (and am now fixing in some other places).
 ------------------------------------------------------------------------
 r32987 | gerald | 2010-05-26 17:49:01 -0700 (Wed, 26 May 2010) | 3 lines
 Changed paths:
    M /trunk/gtk/filter_autocomplete.c
 
 Make sure our prefix length is > 0 before lopping off the last
 character.  Fixes bug 4797.
 ------------------------------------------------------------------------
 r33005 | gerald | 2010-05-27 16:55:04 -0700 (Thu, 27 May 2010) | 4 lines
 Changed paths:
    M /trunk/capture.c
    M /trunk/file.c
    M /trunk/file.h
 
 Add cf_fake_continue_tail() which is called when real-time capture
 updates are off and which sets the capture file state to a value that
 won't cause an assertion when the user stops capturing. Fixes bug 4035.
 ------------------------------------------------------------------------
 r33028 | guy | 2010-05-31 12:37:26 -0700 (Mon, 31 May 2010) | 13 lines
 Changed paths:
    M /trunk/Makefile.am
 
 Wireshark requires routines from libm, such as ceil(), so link with it;
 we shouldn't rely on getting it pulled in by other shared libraries, as
 
 	1) there's no guarantee that the other shared libraries we use
 	   are linked with it or will continue to be linked with it;
 
 	2) there's no guarantee that we're even linking dynamically;
 
 	3) it fails on Fedora 13 as part of a change to catch programs
 	   that implicitly (or explicitly) assume, in their build
 	   procedures, that they'll get libraries linked in as a result
 	   of linking with other libraries.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 ------------------------------------------------------------------------
 r32961 | guy | 2010-05-25 19:01:49 -0700 (Tue, 25 May 2010) | 4 lines
 Changed paths:
    M /trunk/epan/column-utils.c
 
 Once you've used a va_list, you can't use it again until you
 reinitialize it with va_start().  (Yes, there are platforms where
 reusing the va_arg fails, e.g. Mac OS X on x86-64.)
 ------------------------------------------------------------------------
 r32963 | guy | 2010-05-25 19:25:13 -0700 (Tue, 25 May 2010) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/dcerpc/idl2wrs.c
    M /trunk/epan/proto.c
    M /trunk/tools/lemon/lemon.c
    M /trunk/trigcap.c
 
 More <stdarg.h> cleanup; some are real bugs, some are just "don't do
 va_start and va_end unless you're actually going to use the va_list"
 (those bring the va_start and va_end closer to the use point, which
 makes it a little more obvious that we're using <stdarg.h> correctly and
 makes it a little harder to use it incorrectly).
 ------------------------------------------------------------------------
 r33003 | jake | 2010-05-27 14:54:58 -0700 (Thu, 27 May 2010) | 5 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-pgm.c
 
 From  Steven McCoy:
 AFI fields are 2 bytes i.s.o. 1.
 
 From me, several more size changes and decode cleanup.
 ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.2/epan/dissectors/
  Changes    Path            Action
  +2 -2      packet-bgp.h    Modified
  +22 -7     packet-pgm.c    Modified

Directory: /trunk-1.2/doc/
  Changes    Path                Action
  +20 -0     README.developer    Modified

Directory: /trunk-1.2/docbook/
  Changes    Path                 Action
  +36 -6     release-notes.xml    Modified

Directory: /trunk-1.2/epan/
  Changes    Path              Action
  +8 -8      column-utils.c    Modified
  +21 -19    proto.c           Modified

Directory: /trunk-1.2/gtk/
  Changes    Path                     Action
  +9 -5      filter_autocomplete.c    Modified

Directory: /trunk-1.2/tools/lemon/
  Changes    Path          Action
  +1 -1      lemon.c       Modified

Directory: /trunk-1.2/
  Changes    Path                   Action
  +1 -1      Makefile.am            Modified
  +1 -0      capture.c              Modified
  +5 -0      file.c                 Modified


(3 files not shown)