Commit Graph

223 Commits

Author SHA1 Message Date
Eric Anderson 2728f5673f Use AX_PROG_CC_FOR_BUILD macro to identify compiler targeting the build host.
(When cross-compiling, this is *not* the compiler used to build wireshark itself).

Macro ax_prog_cc_for_build.m4 retrieved from http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git

Change-Id: I035059d9315e0081dcf1ffbafd9ce6d7ad46700c
Reviewed-on: https://code.wireshark.org/review/4503
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Eric Anderson <andersoe@cs.cmu.edu>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-10 01:54:27 +00:00
João Valverde 59b5609624 lemon: Use automake rules
Change-Id: I5110e3781682e003cc4e60a592694dc9e8930456
Reviewed-on: https://code.wireshark.org/review/13641
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-03 00:07:42 +00:00
Dario Lombardo 2bf715dcc2 lemon: fix leak.
Found by clang's ccc-analyzer.

Change-Id: I04eaad73486a43a77c4f08cf519bbfe7d2d8c838
Reviewed-on: https://code.wireshark.org/review/13581
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-31 13:27:25 +00:00
João Valverde 21c3a6d91b lemon: Have Makefile.am handle warnings as errors correctly
Change-Id: If0d59eb109802a799c33e439e607178102678f7d
Reviewed-on: https://code.wireshark.org/review/13580
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-01-29 13:07:34 +00:00
Alexis La Goutte e63fd927f9 lemon (tools): Fix Dereference of null pointer found by Clang analyzer
Change-Id: Ica08d9372fbe3809eb078e0285cba2a49cee6b8d
Reviewed-on: https://code.wireshark.org/review/13331
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-22 19:36:37 +00:00
Guy Harris 43d595ec39 Fix another warning on 64-bit platforms.
Change-Id: I5cdf55cdaef048d9d564a5fca39027dae3b78bab
Reviewed-on: https://code.wireshark.org/review/13242
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-12 20:29:44 +00:00
Joerg Mayer 4ffffdadd0 Add the comment about the Wireshark changes github repo from the commit
messages to the README.

Change-Id: Ia73807ca4c04ca0e9019ed22e5733bf378cdf327
Reviewed-on: https://code.wireshark.org/review/13241
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-01-12 20:17:43 +00:00
Alexis La Goutte 9a09f36807 Lemon: resync with upstream
lemon: Thu Oct 29 13:48:15 2015
lempar: Tue Nov 10 14:51:22 2015

a copy of all Wireshark changes are available https://github.com/alagoutte/sqlite/tree/wireshark

Change-Id: I51f8b40a7087362502f6ce2156820a9f107ddf15
Reviewed-on: https://code.wireshark.org/review/13033
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-12 05:42:57 +00:00
João Valverde cac0ab63ee lemon: Fix warnings [-Wpedantic]
Change-Id: I7b350b2c4de5f86de24c8f2309016f3de7af8516
Reviewed-on: https://code.wireshark.org/review/12959
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-07 15:52:24 +00:00
João Valverde 2bc6530a99 lemon: Fix warnings [-Wcast-qual]
Change-Id: I2b9efa50cf6385622601d2a80f4cc51691d080a1
Reviewed-on: https://code.wireshark.org/review/12960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-31 20:13:28 +00:00
Guy Harris f51bad11d7 Use noyywrap rather than defining our own yywrap functions.
Tweak lemonflex-tail.inc to fix an issue this reveals.

It appears that, at least on the buildbots, the Visual Studio compiler
no longer issues warnings for the code generated with %option noyywrap.

Change-Id: Id64d56f1ae8a79d0336488a4a50518da1f511497
Reviewed-on: https://code.wireshark.org/review/12433
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-05 08:06:50 +00:00
Alexis La Goutte e0af790aac lemon (tools): Fix Dereference of null pointer found by Clang analyzer
Change-Id: I6be51833b4268dbfde5c78820004a4714779b0c5
Reviewed-on: https://code.wireshark.org/review/9515
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-23 09:32:38 +00:00
Guy Harris ad52d7d83a Bail out immediately if we can't allocate a buffer for carving up $PATH.
Quit immediately, don't even bother allocating a buffer for the pathname
of the file we found.

Revert some other cosmetic changes, to reduce the differences between us
and upstream.

Change-Id: I217fecee64c7e6bac9272486d0cc334e192b501e
Reviewed-on: https://code.wireshark.org/review/11253
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-25 02:02:16 +00:00
Dario Lombardo 2d2b129493 lemon: move free() to avoid mem leak (CID 718529)
Change-Id: I3b0740f5ccc3b9b87ed351e26f198152bbb1e599
Reviewed-on: https://code.wireshark.org/review/10801
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-25 00:21:48 +00:00
Dario Lombardo 24b5300411 lemon: add free() to avoid mem leak (CID 1309088)
Change-Id: Id32864d324f72ffee9c1033f0f36a79eb2651334
Reviewed-on: https://code.wireshark.org/review/10797
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-24 16:48:09 +00:00
Gerald Combs b05803db4b CMake: Add /WX
Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off,
similar to config.nmake.

We haven't compiled C++ code with -Wshorten-64-to-32 for quite 
some time so there's no need to add -Wno-shorten-64-to-32 in
ui/qt/CMakeLists.txt.

Additionally, squelch

----
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp)
        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled
        with
        [
            _RanIt=QList<QString>::iterator
,            _Pr=bool (__cdecl *)(const QString &,const QString &)
        ]
        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled
        with
        [
            _RanIt=QList<QString>::iterator
,            _Pr=bool (__cdecl *)(const QString &,const QString &)
        ]
        C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled
        with
        [
            _Iter=QList<QString>::iterator
,            _RanIt=QList<QString>::iterator
,            _Diff=int
,            _Pr=bool (__cdecl *)(const QString &,const QString &)
        ]
        .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled
        with
        [
            _RanIt=QList<QString>::iterator
,            _Pr=bool (__cdecl *)(const QString &,const QString &)
        ]
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp)
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp)
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp)
----

in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp
so that we'll compile successfully.

Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357
Reviewed-on: https://code.wireshark.org/review/10533
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-16 21:32:22 +00:00
Alexis La Goutte 71e08dd0de lemonflex: fix warning: no previous prototype for 'df_scanner_*' [-Wmissing-prototypes]
lemonflex-tail.inc:44:1: warning: no previous prototype for 'df_scanner_text' [-Wmissing-prototypes]
lemonflex-tail.inc:50:1: warning: no previous prototype for 'df_scanner_file' [-Wmissing-prototypes]
lemonflex-tail.inc:59:1: warning: no previous prototype for 'df_scanner_cleanup' [-Wmissing-prototypes]

Change-Id: If0476b430592df225234c5c685c8009ab08b5ab6
Reviewed-on: https://code.wireshark.org/review/10162
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-21 04:51:54 +00:00
Alexis La Goutte 3ea89e6155 lemon (tools): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ibfa0bfd589e77a58b7b242c7c2fe25ef052a874e
Reviewed-on: https://code.wireshark.org/review/9516
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-25 18:07:34 +00:00
AndersBroman 88302f267c Try to fix OSX build boot
lemon.c:1784: warning: implicit conversion shortens 64-bit value into a 32-bit value
lemon.c:1790: warning: implicit conversion shortens 64-bit value into a 32-bit value
1790: warning: implicit conversion shortens 64-bit value into a 32-bit value
1928: warning: implicit conversion shortens 64-bit value into a 32-bit value
2707: warning: implicit conversion shortens 64-bit value into a 32-bit value

Change-Id: Ief1b64009891de6885c2c9a6cb0e290752de889f
Reviewed-on: https://code.wireshark.org/review/9463
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 11:09:36 +00:00
Alexis La Goutte 9d8b810127 Lemon: Update lemon tools
Update from SQLite trunk (19 April 2015)

Add include <config.h>

Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)

Fix implicit conversion loses integer precision

Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]

Fix function declaration isn’t a prototype [-Wstrict-prototypes]

Fix warning: old-style function definition [-Wold-style-definition]

Fix trailing whitespace

Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake

Fix -Wmissing-prototypes Remove unused function (acttab_free)

Add basename the filename with only filename (no path...)

Fix lemon.c:3435: warning: implicit conversion shortens 64-bit value into a 32-bit value

Add "new" version of lempar.c (3 November 2009).

LEMPAR: fix trailing whitespace

LEMPAR: fix -Wunused-parameter

Change-Id: I2df7e39c9a6846de26743a981fb76aca423fe813
Reviewed-on: https://code.wireshark.org/review/6502
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-02 08:49:02 +00:00
Pascal Quantin 7d004dc887 Revert "Lemon: Update lemon tools"
This reverts commit 5855dd8d53.

This Lemon update fails to compile on OSX and triggers asserts on other platforms

Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91
Reviewed-on: https://code.wireshark.org/review/6496
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 19:57:45 +00:00
Alexis La Goutte 5855dd8d53 Lemon: Update lemon tools
Fix warning: declaration shadows a variable in the global scope [-Wshadow]

Add include <config.h>

Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_)

Fix implicit conversion loses integer precision

Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare]

Fix function declaration isn’t a prototype [-Wstrict-prototypes]

Fix warning: old-style function definition [-Wold-style-definition]

Fix trailing whitespace

Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake

Fix -Wmissing-prototypes

Remove unused function (acttab_free)

Add basename the filename with only filename (no path...)

Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d
Reviewed-on: https://code.wireshark.org/review/3976
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-11 18:56:08 +00:00
Bill Meier 5c529c95c5 Add '*.nativecodeanalysis.xml' to 'clean' targets
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6
Reviewed-on: https://code.wireshark.org/review/6220
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02 01:45:16 +00:00
Dario Lombardo 63ebe918d9 Removed duplicated #include lines
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c
Reviewed-on: https://code.wireshark.org/review/6065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-28 00:02:39 +00:00
Alexis La Goutte d8001e8064 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\*\* \$Id\$/,+1 d') (2 star and space)

Change-Id: I48505ffb8bfa103cd7db0117e18cdb1925a7034d
Reviewed-on: https://code.wireshark.org/review/884
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:50:19 +00:00
Alexis La Goutte 7d77d753c6 Continue to remove $Id$ from top of file
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ )

Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9
Reviewed-on: https://code.wireshark.org/review/886
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:49:26 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte 09cd306d1c Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\* \$Id\$/,+1 d') (no space before star)

Change-Id: I318968db2b8512ba1303b5fc5c624c66441658f0
Reviewed-on: https://code.wireshark.org/review/879
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:30:52 +00:00
Alexis La Goutte 94a791a76e Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)

Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 16:00:04 +00:00
Jörg Mayer a8002aa0b7 Fix two coverity messages:
*** CID 718534:  Dereference before null check  (REVERSE_INULL)
/tools/lemon/lemon.c: 3425 in translate_code()
3419                rp->rhs[i]->index,i-rp->nrhs+1);
3420           }else{
3421             /* No destructor defined for this term */
3422           }
3423         }
3424       }
>>>     CID 718534:  Dereference before null check  (REVERSE_INULL)
>>>     Null-checking "rp->code" suggests that it may be null, but it has already been
+dereferenced on all paths leading to the check.
3425       if( rp->code ){
3426         cp = append_str(0,0,0,0);
3427         rp->code = Strsafe(cp?cp:"");
3428       }
3429     }
3430

*** CID 1156989:  Out-of-bounds read  (OVERRUN)
/tools/lemon/lemon.c: 3139 in tplt_xfer()
3133       int i, iStart;
3134       char line[LINESIZE];
3135       while( fgets(line,LINESIZE,in) && (line[0]!='%' || line[1]!='%') ){
3136         (*lineno)++;
3137         iStart = 0;
3138         if( name ){
>>>     CID 1156989:  Out-of-bounds read  (OVERRUN)
>>>     Overrunning array "line" of 1000 bytes at byte offset 1000 using index "i"
+(which evaluates to 1000).
3139           for(i=0; line[i] && i<LINESIZE; i++){
3140             if( line[i]=='P' && i<(LINESIZE-5) && strncmp(&line[i],"Parse",5)==0
3141               && (i==0 || !safe_isalpha(line[i-1]))
3142             ){
3143               if( i>iStart ) fprintf(out,"%.*s",i-iStart,&line[iStart]);
3144               fprintf(out,"%s",name);

svn path=/trunk/; revision=54849
2014-01-19 17:59:20 +00:00
Guy Harris 61d5c458a0 Squelch some warnings.
svn path=/trunk/; revision=54711
2014-01-13 19:07:48 +00:00
Balint Reczey 2ec033d15e Fix potential signed int overflow in Lemon
This chrashed Solaris buildbot when -ftrapv was enabled.
Triaged by Guy Harris, see detail at:
http://www.wireshark.org/lists/wireshark-dev/201311/msg00185.html

svn path=/trunk/; revision=53624
2013-11-28 16:04:33 +00:00
Jeff Morriss 0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Evan Huus 2322bd3122 Fix lemon FSF address and add license exception for the generated mate grammar
files. One of them has no license (it is just defines) and the other gets picked
up as LGPL for no reason I can discern.

svn path=/trunk/; revision=52675
2013-10-18 18:10:46 +00:00
Graham Bloice 9c4ee86784 Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.

svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
Chris Maynard fdead4df94 Fix Coverity CID 660 (Negative array index read) by holding off the assignment to yytos until after we check that pParser->yyidx is non-negative.
See also: http://cwe.mitre.org/data/definitions/129.html
#BACKPORT(1.10)

svn path=/trunk/; revision=50336
2013-07-03 02:28:26 +00:00
Chris Maynard 83b4b73dd1 Fix Coverity CID 280323 (Free of array-typed value) by ensuring that tpltname doesn't point to the buf[] stack array before attempting to free it.
#BACKPORT(1.10)

svn path=/trunk/; revision=50335
2013-07-03 01:47:18 +00:00
Chris Maynard ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Gerald Combs 62d87b6cad tools/lemon/lemon.c: Fix an integer shortening issue. (CMake enables
-Werror here but Autotools doesn't. Which is correct?)

epan/dissectors/dcerpc: idl2wrs isn't an installed executable in
Autotools so don't make it one in CMake.

svn path=/trunk/; revision=49871
2013-06-10 18:55:03 +00:00
Gerald Combs c0702583d3 Make the minimum supported GLib version 2.16.
svn path=/trunk/; revision=49444
2013-05-20 17:27:05 +00:00
Anders Broman 3dc702e2a8 Align a bit more with upstream.
svn path=/trunk/; revision=48559
2013-03-26 05:36:27 +00:00
Anders Broman f20eeffb18 Align lempar somewhat with upstream.
svn path=/trunk/; revision=48071
2013-03-04 22:04:58 +00:00
Anders Broman 41d6d12497 Rearrang the code to align with sqlite lemon and copy over a few more things.
svn path=/trunk/; revision=48014
2013-03-02 19:34:50 +00:00
Anders Broman bd2b6b9964 Wite space changes.
svn path=/trunk/; revision=48005
2013-03-02 12:09:50 +00:00
Anders Broman b9cb9968f2 lemon.c:3176:8: error: attempt to free a non-heap object ‘buf’
svn path=/trunk/; revision=48003
2013-03-02 11:32:25 +00:00
Anders Broman 310b495ff3 Becport more code.
svn path=/trunk/; revision=48002
2013-03-02 10:56:17 +00:00
Anders Broman ad1ec109ed Missed one place.
svn path=/trunk/; revision=48001
2013-03-02 10:03:43 +00:00
Anders Broman da070427d9 lemon.c:78:14: note: expected ‘int (*)(const void *, const void *)’ but argument is of type ‘int (*)(const char *, const char *)’
svn path=/trunk/; revision=48000
2013-03-02 09:54:52 +00:00
Anders Broman 99d88bd54b More backports from sqlite lemon to try to address warnings.
svn path=/trunk/; revision=47998
2013-03-02 09:04:52 +00:00
Anders Broman 7c3a122e37 lemon.c:4628:5: error: conflicting types for ‘Configcmp’
lemon.c:366:5: note: previous declaration of ‘Configcmp’ was here

svn path=/trunk/; revision=47997
2013-03-02 08:40:49 +00:00
Anders Broman 18c724b0ad More backports from sqlite lemon to try to address warnings.
svn path=/trunk/; revision=47996
2013-03-02 08:19:31 +00:00
Anders Broman a5c53e847e Backports from sqlite lemon.
svn path=/trunk/; revision=47993
2013-03-01 23:54:06 +00:00
Jeff Morriss 0b8d70bfb7 Fix a cut-n-pasteo and add a const cast to quiet a warning.
svn path=/trunk/; revision=47991
2013-03-01 22:58:23 +00:00
Anders Broman ea76d02cb2 Backport const casts from sqlite lemon.
svn path=/trunk/; revision=47989
2013-03-01 21:37:48 +00:00
Anders Broman 44993045a2 try to remove C++ incompatibilities from lemon
svn path=/trunk/; revision=47987
2013-03-01 20:32:20 +00:00
Guy Harris eb769ce13e Clean up some warnings (including warnings that ultimately come from
trying to modify string constants, which isn't necessarily guaranteed to
work).

svn path=/trunk/; revision=47618
2013-02-10 22:09:21 +00:00
Guy Harris fbe74322b1 From Bill Parker:
Add some additional memory-allocation failure checks in Lemon.

	Use NULL rather than 0 as the null-pointer constant in those
	checks.

From me:

	Catch one more of the NULL-vs-0 cases.

	Fix some failure messages to use fprintf(stderr, ...) -
	ErrorMsg() requires a file name and line number, and is
	generally used if you're going to continue rather than just give
	up.

svn path=/trunk/; revision=45214
2012-09-29 19:40:27 +00:00
Jeff Morriss 1a97b58332 Followup to r45034: Don't define _U_ on the compile line, pull it in from
config.h (like we do in cmake).  We always HAVE_CONFIG_H so don't check for it.

svn path=/trunk/; revision=45050
2012-09-21 21:29:18 +00:00
Jeff Morriss abc482e578 Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back off
the compile line when building with cmake.

Put _U_'s definition in config.h when building with autofoo and on Windows.

svn path=/trunk/; revision=45034
2012-09-21 01:42:03 +00:00
Evan Huus 5983528b69 Fix lemon build with cmake by defining _U_. I feel like there's a better
way than all the horrid escaping I had to do, but I don't know what it is.

svn path=/trunk/; revision=45019
2012-09-20 02:55:22 +00:00
Jeff Morriss 4501a9bc84 lemon is not compiled with HAVE_CONFIG_h so don't test for it nor try to include it.
svn path=/trunk/; revision=45018
2012-09-20 02:18:24 +00:00
Chris Maynard 5f6a3400dc Fix Coverity CID 709600: Resource leak.
svn path=/trunk/; revision=43694
2012-07-13 20:04:28 +00:00
Anders Broman 80aba5ebf7 From Martin Kaiser:
CID 280531: "Argument cannot be negative" in lemon
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7453

svn path=/trunk/; revision=43619
2012-07-09 02:24:07 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Jörg Mayer 2d7a4646e2 Include config.h in preparation of moving the definition
of _U_ from the compiler command line into config.h

svn path=/trunk/; revision=40806
2012-02-02 11:54:33 +00:00
Anders Broman 0179b7dc50 Add *.sbr files to the clean target.
svn path=/trunk/; revision=40763
2012-01-29 20:33:58 +00:00
Jörg Mayer 1ac8e97ff8 Fix an old style function declaration warning.
svn path=/trunk/; revision=37278
2011-05-19 04:42:57 +00:00
Chris Maynard c236db55fe Don't use pParser->yyidx as an index into pParser->yystack[] until after it is
verified that it is non-negative.  Should resolve CID 619.

svn path=/trunk/; revision=36431
2011-04-01 16:55:59 +00:00
Ronnie Sahlberg f4d68c6a08 Memory leak in lemon.c
coverity 1177


svn path=/trunk/; revision=36427
2011-03-31 20:50:13 +00:00
Stig Bjørlykke feb0a4aeaa Allocate space for null termination in make_basename.
Coverity 710.

svn path=/trunk/; revision=36247
2011-03-22 11:46:19 +00:00
Ronnie Sahlberg dddec126f6 Coverity 323
Use strdup to copy a string literal we will free() later on.



svn path=/trunk/; revision=36240
2011-03-22 09:12:57 +00:00
Bill Meier d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +00:00
Bill Meier b0aac9d9c2 WIN32 ==> _WIN32
svn path=/trunk/; revision=35745
2011-02-01 23:02:54 +00:00
Guy Harris 347e7a0052 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).

svn path=/trunk/; revision=32963
2010-05-26 02:25:13 +00:00
Jeff Morriss 54082c6ed0 Add Cmake stuff to the source distribution so more people can try it out.
svn path=/trunk/; revision=32807
2010-05-14 16:27:03 +00:00
Stig Bjørlykke 17f62a4e1d Removed an unused assignment.
svn path=/trunk/; revision=30893
2009-11-09 14:25:29 +00:00
Jörg Mayer 9ee31d1d0e cmake will now honor -Werror if configured (default: on)
svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
Stig Bjørlykke fd1a8138cb From Eric Sesterhenn via bug 4175:
Fixed fp leakage in error path.

svn path=/trunk/; revision=30757
2009-10-29 11:23:04 +00:00
Stig Bjørlykke 39c732d8bf Removed some redundant prototypes and some shadowed variables.
svn path=/trunk/; revision=30632
2009-10-20 09:31:07 +00:00
Kovarththanan Rajaratnam ee95203649 Add tools/lemon/CMakeLists.txt which creates the lemon parser executable
svn path=/trunk/; revision=30461
2009-10-10 05:51:08 +00:00
Stig Bjørlykke 7678317238 Move declaration of yymx.
svn path=/trunk/; revision=28660
2009-06-08 11:54:38 +00:00
Stig Bjørlykke 618153d40f Remove resetting useCnt in errsym, as it seems to disable some error checking
we need to validate the filter syntax.

svn path=/trunk/; revision=28659
2009-06-08 10:03:41 +00:00
Gerald Combs e7a8150c7b Fix a bunch of Win64 compilation errors by cowardly casting size_ts to ints.
svn path=/trunk/; revision=25992
2008-08-12 21:25:19 +00:00
Anders Broman 27111e59f3 Update to sqlite lemon.c 1.60 and lempar.c 1.36
svn path=/trunk/; revision=25858
2008-07-29 12:40:03 +00:00
Guy Harris 9fb914942a Suppress some unused-argument warnings.
svn path=/trunk/; revision=25422
2008-06-04 00:35:30 +00:00
Bill Meier ff52380765 Bug 2493: Fix (Part 1):
-TEXT_FUNC (const char *text) --> -TEXT_FUNC (char *text)
To prevent Windows compiler error when using flex 2.5.35.
(This also compiles OK for *NIX flex and for windows flex 2.5.4) 

svn path=/trunk/; revision=25172
2008-04-25 17:24:29 +00:00
Anders Broman 25b308442d Update Lemon to v1.54 and lempar to v 1.31 from sqlite http://www.sqlite.org/cvstrac/dir?d=sqlite/tool
svn path=/trunk/; revision=24845
2008-04-08 09:54:19 +00:00
Stephen Fisher 726a1caaf1 - Remove GLIB1 code
- Change ugly GLIB version checking statements to GLIB_CHECK_VERSION
- Remove ws_strsplit files because we no longer need to borrow GLIB2's
  g_strsplit code for the no longer supported GLIB1 builds


svn path=/trunk/; revision=24829
2008-04-07 05:22:54 +00:00
Jaap Keuter 098d297303 Running glib 2.16 on 32 bit platform requires this lempar.c change in addition to revision 24710.
Makefiles updated to make new lempar.c effective in build rules.

svn path=/trunk/; revision=24718
2008-03-23 08:58:52 +00:00
Anders Broman 593735b96e Update to sqlite lemon 1.51
svn path=/trunk/; revision=23629
2007-11-27 21:25:32 +00:00
Guy Harris cab450519f If YY_SKIP_YYWRAP is defined, don't bother defining WRAP_FUNC - with
flex 2.5.31, WRAP_FUNC will end up being defined as a value that, when
used as a function-style macro, expands to 1, so the definition of
WRAP_FUNC will get a syntax error.

svn path=/trunk/; revision=22428
2007-07-31 01:24:26 +00:00
Graham Bloice 85c33a07cb Remove build detritus
svn path=/trunk/; revision=21347
2007-04-06 15:51:36 +00:00
Stephen Fisher 46b8669566 Fix a bunch more warnings. Add -Werror when using --with-warnings-as-errors
under gcc to tools/lemon, plugins/mate and epan/


svn path=/trunk/; revision=21204
2007-03-26 06:10:52 +00:00
Ulf Lamping 3575d95342 set "treat warnings as errors" CFLAGS, no warning were in this dir :-)
svn path=/trunk/; revision=21183
2007-03-25 15:39:06 +00:00
Ulf Lamping 3dfa722849 fix warnings of (generated) grammar.c
svn path=/trunk/; revision=21146
2007-03-23 03:45:18 +00:00
Luis Ontanon 9a64c881a1 squelch signedness warnings generated by generated code due to mayors being decleared as signed but added as signed in tables (it will generate larger tables when the number of tokens or actions is more than MAX_INT8, MAX_INT16).
svn path=/trunk/; revision=21138
2007-03-23 00:15:48 +00:00
Ulf Lamping e28d403669 add type casts to fix two warnings
svn path=/trunk/; revision=21137
2007-03-22 23:50:38 +00:00
Luis Ontanon 0006c73c8d squelch a warning generated by generated code
svn path=/trunk/; revision=21134
2007-03-22 23:39:02 +00:00
Bill Meier 04d29de81d Fix Windows Makefiles so clean removes all pdb files (PDB_FILE no longer defined)
svn path=/trunk/; revision=21052
2007-03-18 15:36:22 +00:00
Jörg Mayer 711cb02a80 Nikns Siankin: Fix for http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1387
svn path=/trunk/; revision=20874
2007-02-20 17:40:07 +00:00