Wireshark-commits: [Wireshark-commits] rev 37398: /trunk-1.6/ /trunk-1.6/epan/dissectors/: packet-d
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=37398
User: gerald
Date: 2011/05/25 02:20 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r37203 | morriss | 2011-05-17 11:53:35 -0700 (Tue, 17 May 2011) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-dvbci.c
M /trunk/epan/dissectors/packet-reload.c
M /trunk/epan/dissectors/packet-stun.c
M /trunk/epan/dissectors/packet-xcsl.c
Use val_to_str() instead of blindly passing the return value from match_strval()
into a format routine (to ensure a non-NULL string pointer).
------------------------------------------------------------------------
r37207 | tuexen | 2011-05-17 12:51:55 -0700 (Tue, 17 May 2011) | 5 lines
Changed paths:
M /trunk/wiretap/wtap.c
* Don't declare a used arg as unused.
* Really clear the EOF flag. This fixes a bug where
tshark is not able to do a live capture from a pcapng
file.
------------------------------------------------------------------------
r37211 | guy | 2011-05-17 14:26:25 -0700 (Tue, 17 May 2011) | 4 lines
Changed paths:
M /trunk/file.h
M /trunk/gtk/export_object.h
M /trunk/gtk/export_object_smb.c
M /trunk/gtk/file_import_dlg.c
M /trunk/gtk/main_welcome.c
M /trunk/gtk/new_packet_list.c
M /trunk/gtk/text_import.h
This ain't C++; you have to put "void" in as the argument list of
functions that take no arguments, otherwise the function is treated as a
crufty old C function with undeclared arguments.
------------------------------------------------------------------------
r37212 | guy | 2011-05-17 14:28:07 -0700 (Tue, 17 May 2011) | 4 lines
Changed paths:
M /trunk/epan/oids.c
This ain't C++; you have to put "void" in as the argument list of
functions that take no arguments, otherwise the function is treated as a
crufty old C function with undeclared arguments.
------------------------------------------------------------------------
r37216 | guy | 2011-05-17 15:18:32 -0700 (Tue, 17 May 2011) | 2 lines
Changed paths:
M /trunk/color_filters.c
M /trunk/epan/funnel.c
M /trunk/epan/packet.c
M /trunk/epan/wslua/init_wslua.c
M /trunk/file.c
M /trunk/gtk/prefs_stream.c
M /trunk/gtk/sctp_stat_dlg.c
M /trunk/print.c
M /trunk/u3.c
More eradication of old-style function definitions.
------------------------------------------------------------------------
r37224 | guy | 2011-05-17 16:35:12 -0700 (Tue, 17 May 2011) | 2 lines
Changed paths:
M /trunk/ringbuffer.c
Fix another old-style function definition.
------------------------------------------------------------------------
r37235 | guy | 2011-05-17 20:28:26 -0700 (Tue, 17 May 2011) | 2 lines
Changed paths:
M /trunk/epan/proto.c
Make some more routines not used outside epan/proto.c static.
------------------------------------------------------------------------
r37223 | guy | 2011-05-17 16:33:23 -0700 (Tue, 17 May 2011) | 9 lines
Changed paths:
M /trunk/epan/oids.c
M /trunk/gtk/export_object_smb.c
M /trunk/gtk/iax2_analysis.c
M /trunk/gtk/manual_addr_resolv.c
M /trunk/gtk/menus.c
M /trunk/gtk/new_packet_list.c
M /trunk/gtk/packet_list_store.h
M /trunk/gtk/proto_help.c
M /trunk/gtk/rtp_analysis.c
M /trunk/gtk/voip_calls.c
M /trunk/util.c
Make some routines static that aren't used outside the source file in
which they're defined.
Include some header files that declare functions in the source files
that define the functions.
Declare packet_list_get_type() in gtk/packet_list_store.h, as it defines
a macro that uses that function.
------------------------------------------------------------------------
r37226 | guy | 2011-05-17 16:36:25 -0700 (Tue, 17 May 2011) | 3 lines
Changed paths:
M /trunk/epan/geoip_db.c
Make some routines static that aren't used outside the source file in
which they're defined.
------------------------------------------------------------------------
r37230 | guy | 2011-05-17 17:29:48 -0700 (Tue, 17 May 2011) | 2 lines
Changed paths:
M /trunk/epan/oids.c
Get rid of unused function.
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+2 -2 packet-dvbci.c Modified
+2 -5 packet-reload.c Modified
+4 -7 packet-stun.c Modified
+2 -2 packet-xcsl.c Modified
Directory: /trunk-1.6/epan/
Changes Path Action
+1 -1 funnel.c Modified
+1 -1 geoip_db.c Modified
+1 -9 oids.c Modified
+2 -2 packet.c Modified
+9 -4 proto.c Modified
Directory: /trunk-1.6/gtk/
Changes Path Action
+1 -1 export_object.h Modified
+2 -2 export_object_smb.c Modified
(22 files not shown)