Wireshark-commits: [Wireshark-commits] master cfcbb28: Clean up ftype-conversion and dfilter error
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 18 Jan 2015 10:23:03 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cfcbb286712ae392689e7cd1a640b57b611dd277
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

cfcbb28 by Guy Harris (guy@xxxxxxxxxxxx):

    Clean up ftype-conversion and dfilter error message string handling.
    
    Have dfilter_compile() take an additional gchar ** argument, pointing to
    a gchar * item that, on error, gets set to point to a g_malloc()ed error
    string.  That removes one bit of global state from the display filter
    parser, and doesn't impose a fixed limit on the error message strings.
    
    Have fvalue_from_string() and fvalue_from_unparsed() take a gchar **
    argument, pointer to a gchar * item, rather than an error-reporting
    function, and set the gchar * item to point to a g_malloc()ed error
    string on an error.
    
    Allow either gchar ** argument to be null; if the argument is null, no
    error message is allocated or provided.
    
    Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c
    Reviewed-on: https://code.wireshark.org/review/6608
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  c60fb30   Try to make Mac OS X Buildbots happy
    adds  cfcbb28   Clean up ftype-conversion and dfilter error message string handling.


Summary of changes:
 color_filters.c                    |   24 ++--
 dftest.c                           |    6 +-
 echld/child.c                      |   20 +--
 epan/column.c                      |    2 +-
 epan/dfilter/dfilter-int.h         |   11 +-
 epan/dfilter/dfilter-macro.c       |   47 ++++---
 epan/dfilter/dfilter.c             |   63 +++++----
 epan/dfilter/dfilter.h             |   20 +--
 epan/dfilter/dfunctions.c          |   12 +-
 epan/dfilter/dfunctions.h          |    2 +-
 epan/dfilter/grammar.lemon         |   16 +--
 epan/dfilter/scanner.l             |   34 ++---
 epan/dfilter/semcheck.c            |  268 ++++++++++++++++++++----------------
 epan/dfilter/sttype-function.h     |    1 +
 epan/dissectors/packet-ncp2222.inc |    8 +-
 epan/ftypes/ftype-bytes.c          |  137 ++++++++++--------
 epan/ftypes/ftype-double.c         |   16 ++-
 epan/ftypes/ftype-guid.c           |    5 +-
 epan/ftypes/ftype-integer.c        |  135 +++++++++---------
 epan/ftypes/ftype-ipv4.c           |   15 +-
 epan/ftypes/ftype-ipv6.c           |   13 +-
 epan/ftypes/ftype-pcre.c           |   16 ++-
 epan/ftypes/ftype-string.c         |    6 +-
 epan/ftypes/ftype-time.c           |   16 +--
 epan/ftypes/ftype-tvbuff.c         |    6 +-
 epan/ftypes/ftypes-int.h           |    4 +-
 epan/ftypes/ftypes.c               |   26 ++--
 epan/ftypes/ftypes.h               |    6 +-
 epan/funnel.h                      |    2 +-
 epan/tap.c                         |   12 +-
 epan/wslua/wslua_field.c           |    6 +-
 epan/wslua/wslua_gui.c             |    7 +-
 file.c                             |   16 ++-
 rawshark.c                         |    7 +-
 tfshark.c                          |   11 +-
 tshark.c                           |   13 +-
 ui/capture.c                       |    2 +-
 ui/gtk/capture_file_dlg.c          |   12 +-
 ui/gtk/color_edit_dlg.c            |    6 +-
 ui/gtk/dfilter_expr_dlg.c          |   23 +---
 ui/gtk/filter_dlg.c                |   56 ++++----
 ui/gtk/find_dlg.c                  |    9 +-
 ui/gtk/funnel_stat.c               |   13 +-
 ui/gtk/gui_utils.c                 |    5 +-
 ui/gtk/gui_utils.h                 |    5 +-
 ui/gtk/iax2_analysis.c             |    6 +-
 ui/gtk/io_stat.c                   |    6 +-
 ui/gtk/main.c                      |   13 +-
 ui/gtk/main_menubar.c              |    2 +-
 ui/gtk/rlc_lte_graph.c             |    6 +-
 ui/gtk/rtp_analysis.c              |    6 +-
 ui/gtk/sctp_assoc_analyse.c        |    6 +-
 ui/qt/display_filter_edit.cpp      |    6 +-
 ui/qt/io_graph_dialog.cpp          |    6 +-
 ui/qt/main_window.cpp              |    7 +-
 ui/qt/main_window_slots.cpp        |    8 +-
 ui/qt/search_frame.cpp             |    2 +-
 ui/qt/syntax_line_edit.cpp         |   18 ++-
 ui/qt/syntax_line_edit.h           |    2 +
 ui/tap-tcp-stream.c                |    6 +-
 60 files changed, 698 insertions(+), 542 deletions(-)