Wireshark · Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 49949: /trunk/ /trunk/ui/gtk/: iax2_analysis.c main.c pa

["Maynard, Chris" <Christopher.Maynard@xxxxxxxxx>]

This change seems to have broken the Windows build if WANT_PACKET_EDITOR is defined in config.nmake:

packet_win.c
packet_win.c(251) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(251) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(261) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(261) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(271) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(271) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(271) : warning C4133: 'function' : incompatible types - from 'frame
_data *' to 'const guint8 *'
packet_win.c(271) : error C2198: 'epan_dissect_run' : too few arguments for call

packet_win.c(298) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(298) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(342) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(342) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(433) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(433) : error C2039: 'buf' : is not a member of 'FieldinfoWinData'
        packet_win.c(91) : see declaration of 'FieldinfoWinData'
packet_win.c(771) : error C2088: '&' : illegal for struct
packet_win.c(774) : error C2088: '&' : illegal for struct
packet_win.c(793) : error C2088: '|=' : illegal for struct
packet_win.c(795) : error C2088: '&=' : illegal for struct
packet_win.c(829) : warning C4133: '=' : incompatible types - from 'guint8 *' to
 'Buffer *'
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 10.0
\VC\Bin\amd64\cl.EXE"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 10.0
\VC\Bin\amd64\nmake.exe"' : return code '0x2'
Stop.

-----Original Message-----
From: wireshark-commits-bounces@xxxxxxxxxxxxx [mailto:wireshark-commits-bounces@xxxxxxxxxxxxx] On Behalf Of guy@xxxxxxxxxxxxx
Sent: Saturday, June 15, 2013 8:20 PM
To: wireshark-commits@xxxxxxxxxxxxx
Subject: [Wireshark-commits] rev 49949: /trunk/ /trunk/ui/gtk/: iax2_analysis.c main.c packet_list_store.c packet_win.c rlc_lte_graph.c rtp_analysis.c sctp_assoc_analyse.c tcp_graph.c /trunk/: cfile.h file.c file.h ...

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

User: guy
Date: 2013/06/15 05:20 PM

Log:
 Have the seek-read routines take a Buffer rather than a guint8 pointer  as the "where to put the packet data" argument.
 
 This lets more of the libwiretap code be common between the read and  seek-read code paths, and also allows for more flexibility in the "fill  in the data" path - we can expand the buffer as needed in both cases.

Directory: /trunk/ui/gtk/
  Changes    Path                    Action
  +2 -1      iax2_analysis.c         Modified
  +4 -2      main.c                  Modified
  +6 -3      packet_list_store.c     Modified
  +31 -30    packet_win.c            Modified
  +1 -1      rlc_lte_graph.c         Modified
  +1 -1      rtp_analysis.c          Modified
  +1 -1      sctp_assoc_analyse.c    Modified
  +1 -1      tcp_graph.c             Modified

Directory: /trunk/
  Changes    Path                  Action
  +1 -1      cfile.h               Modified
  +39 -19    file.c                Modified
  +3 -3      file.h                Modified


(54 files not shown)
CONFIDENTIALITY NOTICE: The information contained in this email message is intended only for use of the intended recipient. If the reader of this message is not the intended recipient, you are hereby notified that any dissemination, distribution or copying of this communication is strictly prohibited. If you have received this communication in error, please immediately delete it from your system and notify the sender by replying to this email.  Thank you.