Commit Graph

226 Commits

Author SHA1 Message Date
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
Luis Ontanon 822594e0ce do not use an uninitialized rp->line to generate destructor code for rules without code.
svn path=/trunk/; revision=20737
2007-02-07 16:08:19 +00:00
Luis Ontanon d1c6370f9b It looks that their fix to my fix broke things out...
svn path=/trunk/; revision=20452
2007-01-16 16:41:12 +00:00
Luis Ontanon 74ed71d648 update to lemon.c 1.43
svn path=/trunk/; revision=20447
2007-01-16 05:38:55 +00:00
Luis Ontanon 47730bc1e8 Fix a major leakage of token minors in lemon generated parsers due to the fact that lemon was not genmerating destructor code for elements in the RHS of rules without C-code.
svn path=/trunk/; revision=20442
2007-01-15 19:48:06 +00:00
Anders Broman a0b76c2fa2 Update to the latest versions from sqlite.
svn path=/trunk/; revision=19932
2006-11-19 16:24:18 +00:00
Jörg Mayer dd26a7021b nikai@nikai.net:
Remaining fixes from:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1225

svn path=/trunk/; revision=19895
2006-11-14 20:32:29 +00:00
Guy Harris 9e184d0a13 xxx_PROGRAMS variables have the name of the program without $(EXEEXT).
Update Gerald's address.

svn path=/trunk/; revision=19796
2006-11-04 20:37:16 +00:00
Michael Tüxen c256574f2c Fixes ./autogen.sh on Mac OS X...
svn path=/trunk/; revision=19782
2006-11-03 10:12:36 +00:00
Jörg Mayer 63f00dfdc7 Robert Schwebel:
Fix for http://bugs.wireshark.org/bugzilla/attachment.cgi?id=419&action=view
  cross compilation fails

With the following change: Use only AC_CANONICAL_TARGET

From the autoconf manual:
     The user is encouraged to use either `AC_CANONICAL_BUILD', or
     `AC_CANONICAL_HOST', or `AC_CANONICAL_TARGET', depending on the
     needs.  Using `AC_CANONICAL_TARGET' is enough to run the two other
     macros.


svn path=/trunk/; revision=19753
2006-10-31 11:35:55 +00:00
Anders Broman 903a75ff72 Update lempar to sqlittes version 1.18
http://www.sqlite.org/cvstrac/rlog?f=sqlite/tool/lempar.c

svn path=/trunk/; revision=18815
2006-08-01 21:29:05 +00:00
Gerald Combs 4ed6fc0bc3 Ethereal -> Wireshark
svn path=/trunk/; revision=18374
2006-06-06 23:27:21 +00:00
Gerald Combs b15974d094 libethereal -> libwireshark. idl2eth -> idl2wrs. There are a _lot_ of
changes here.  It compiles OK on OS X, but hasn't been tested anywhere else.

svn path=/trunk/; revision=18260
2006-05-31 00:23:01 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Anders Broman 699146b353 Doc update from Sqlite
svn path=/trunk/; revision=17707
2006-03-23 17:01:51 +00:00
Guy Harris ed351b85c1 Use "opt_func_string_t" so that we get some more type checking done.
Use safe_ versions of <ctype.h> macros, so we don't get hosed by
characters with the 8th bit set.

Define "tplt_linedir()" with a function prototype.

Constify some stuff to squelch compiler warnings.

svn path=/trunk/; revision=17694
2006-03-21 23:55:30 +00:00
Guy Harris 7a2997ff83 Make it a bit more like the SQLite lemon.c 1.36.
Get rid of some function pointer casting.

Get rid of an unused routine, and make some routines static.

Remove trailing white space.

svn path=/trunk/; revision=17693
2006-03-21 23:17:15 +00:00
Anders Broman 2d99b1a362 Mimmicing lemon.c 1.36 exactly for Symbolcmpp does not make MSVC completly happy, see what FC4 says.
svn path=/trunk/; revision=17692
2006-03-21 20:03:56 +00:00
Anders Broman b5f2bdac77 Upadates to squlite:s lemon 1.36
svn path=/trunk/; revision=17691
2006-03-21 18:56:34 +00:00
Anders Broman bc7e69cc09 Try again, this should take us to lemon version 1.16 http://www.sqlite.org/cvstrac/rlog?f=sqlite/tool/lemon.c
svn path=/trunk/; revision=17683
2006-03-20 19:40:09 +00:00
Anders Broman 17cee445d7 Back out the previous changes (:
svn path=/trunk/; revision=17680
2006-03-20 08:16:03 +00:00
Anders Broman 4edc146c8d Insert the code from sqlite http://www.sqlite.org/cvstrac/rlog?f=sqlite/tool/lemon.c:
2002-Mar-10 21:21    1.11    Check-in [425] : Bug fix: updates within a transaction would fail if there was existed a temporary table. By drh. (diff)  
2002-Mar-03 02:49    1.10    Check-in [411] : Bug fixes and additional tests for the subquery flattener. By drh. (diff)  

svn path=/trunk/; revision=17679
2006-03-20 06:41:08 +00:00
Anders Broman 5d20a3ba36 Sqlite lemon 1.8 ( 1.7 Make lemon 64-bit clean skipped) :
Bugfix Check-in [388] : Bug fix in lemon: 3-way conflicts (SHIFT/REDUCE/REDUCE) were not detected or resolved. This is now fixed. Also, table compression works a little better. By drh. (diff) 

http://www.sqlite.org/cvstrac/rlog?f=sqlite/tool/lemon.c 


svn path=/trunk/; revision=17668
2006-03-19 13:59:44 +00:00
Anders Broman 94d4d822da Align lemon/lempar.c with Squlite ver 1.2 http://www.sqlite.org/cvstrac/rlog?f=sqlite/tool/lempar.c
svn path=/trunk/; revision=17666
2006-03-19 08:54:00 +00:00
Anders Broman 4f48d73d90 Copy a bugfix from http://www.sqlite.org/cvstrac/tktview?tn=313
svn path=/trunk/; revision=17651
2006-03-16 22:18:15 +00:00
Luis Ontanon 943848cb02 Actually fix that leak!
svn path=/trunk/; revision=17540
2006-03-09 00:50:05 +00:00
Luis Ontanon cdc088fb66 An unimportant and harmless one per run leak in a tool used for building... Coverity cannot evaluate that :P
run 14 CID 107


svn path=/trunk/; revision=17526
2006-03-08 10:58:09 +00:00
Anders Broman 0331204009 Undo the prevous unfortunate "rearrangement of code".
svn path=/trunk/; revision=17508
2006-03-07 20:24:11 +00:00
Anders Broman 7e8a72a218 Fix a bug reported by covierty and solved by http://www.sqlite.org/cvstrac/rlog?f=sqlite/tool/lemon.c
Rearrange the code a bit to make it easier to make a diff with the sqlite version of lemon.

svn path=/trunk/; revision=17502
2006-03-07 18:18:04 +00:00
Jörg Mayer cee545d958 Albert Chin:
"config.h" should always be included first. However, lemon
        includes <stdio.h> first.


svn path=/trunk/; revision=15208
2005-08-04 20:41:52 +00:00
Jörg Mayer 5e83d1e015 Fix more "no previous declaration" warnings
svn path=/trunk/; revision=15172
2005-08-02 04:35:40 +00:00
Anders Broman 40c841279f rom Maynard, Chris :
The attached patches, generated via  svn diff , correct various compiler 

& lint warnings, among them: 

 

lemon.c(2582) : warning C4090: '=' : different 'const' qualifiers


svn path=/trunk/; revision=15086
2005-07-26 09:52:50 +00:00
Jörg Mayer 30a8557868 More 'char*' -> 'const char*' changes to fix warnings.
svn path=/trunk/; revision=15015
2005-07-23 11:41:25 +00:00
Jörg Mayer e1c6d9ac3d Fix some warnings (and one of my previous 'fixes')
svn path=/trunk/; revision=14997
2005-07-22 17:57:40 +00:00
Jörg Mayer f67b00ad9a More 'char*' -> 'const char*' warning fixes
svn path=/trunk/; revision=14986
2005-07-22 07:55:51 +00:00
Jörg Mayer 5b442f2279 After doing "make maintainer-clean", "svn status --no-ignore | grep ^I"
returned quite a list of files. Add them to MAINTAINERCLEANFILES.

Whitespace changes (replace multiple spaces by TABs, in a few cases this
needed to be done at the beginning of Makefile lines.


svn path=/trunk/; revision=14891
2005-07-10 08:04:27 +00:00
Gerald Combs b94621701c From Steve Grubb:
Fix bounds checking in lemon.c.  Fix up an if/else block in
packet-dcerpc-samr.c.  Fix hex printing in packet-gtp.c.


Fix other problems discovered by Steve:

Fix a bounds check in packet-isis-lsp.c.  Also, fix netmask printing
on non-little-endian machines.  Add a comment about adding a netmask
routine to to_str.c.  Add bounds checks to packet-ncp2222.inc.


All of these apply to bug 217.

svn path=/trunk/; revision=14627
2005-06-14 18:18:05 +00:00
Anders Broman 53c43f0757 Add a comment about where lemon is maintained now.
svn path=/trunk/; revision=13781
2005-03-16 22:09:30 +00:00
Guy Harris 6616a3770c Make the "maintainer-clean" rules get rid of some additional generated
files.  Do this with GENERATED_HEADER_FILES, GENERATED_C_FILES, and
GENERATED_FILES macros in Makefile.common files, along the lines of what
wiretap/Makefile.common has.

Clean up "*~" files with "make clean" rather than only "make distclean"
in some additional places.

Add "maintainer-clean" rules to the Makefile.nmake files, paralelling
the ones in the automake-generated Makefile.in files, using the
GENERATED_FILES macros from Makefile.common files.  In some cases, move
the cleanup of files from "make distclean" to "make maintainer-clean",
and in other cases, put in a comment indicating why we're not doing that
(because some files that are distributed in the source tarballs, namely
Flex output, were built with a UN*X Flex and won't compile on Windows,
so we get rid of them with "make distclean" so you can clean up stuff
that *has* to be re-generated for Windows).

Clean up some *CLEANFILES definitions - get rid of ones that no longer
apply as files were moved or that add to the definition a name that's
already there.

svn path=/trunk/; revision=13402
2005-02-14 20:33:57 +00:00
Gerald Combs 655dd8d96b Fix up the declaration of yy_accept().
svn path=/trunk/; revision=11521
2004-07-25 17:35:57 +00:00
Jörg Mayer e869dbb17d Trivial warning fixes:
- comma at end of enum
- function declarations with empty args instead of void
- c++ style comments

svn path=/trunk/; revision=11492
2004-07-23 23:28:08 +00:00
Jörg Mayer fd24ad7d92 .cvsignore is dead
it has been replaced by
svn proplist -v <dir/file>
and
svn propedit <dir/file>

svn path=/trunk/; revision=11422
2004-07-18 23:44:34 +00:00
Jörg Mayer 56c759212f Add epan/dissectors/.cvsignore
Add tags and TAGS to all .cvsignore files

svn path=/trunk/; revision=11419
2004-07-18 22:51:50 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Gilbert Ramirez f31ddecf91 Add support for flex 2.5.31.
svn path=/trunk/; revision=10684
2004-04-25 04:53:42 +00:00
Jörg Mayer 61581fb780 Fix a warning by using a function typedef
svn path=/trunk/; revision=9834
2004-01-25 09:49:50 +00:00
Jörg Mayer 76c7e98449 Fix some of the warnings when compiling with -Wstrict-prototypes
svn path=/trunk/; revision=9720
2004-01-18 15:53:43 +00:00
Ulf Lamping d604209b21 removed some MSVC warnings (added type casts)
svn path=/trunk/; revision=9371
2003-12-21 00:16:54 +00:00
Guy Harris 02e1d2680a Give every Makefile.nmake file a "distclean" rule, and have "distclean"
recurse into subdirectories doing "nmake -f Makefile.nmake distclean".

Have "nmake -f Makefile.nmake clean" not remove stuff that "make clean"
doesn't remove (such as Flex/Bison output and config.h files) - and have
"nmake -f Makefile.nmake distclean" remove stuff that "make distclean"
removes, including "tethereal-tap-register.c" and
"ethereal-tap-register.c".

svn path=/trunk/; revision=8672
2003-10-10 21:31:53 +00:00
Jörg Mayer 7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Guy Harris 6744433452 From Joerg Mayer: mark possibly-unused arguments as unused.
svn path=/trunk/; revision=5388
2002-05-04 10:19:20 +00:00
Guy Harris c942bebb4c From Joerg Mayer: get rid of an unused argument, and flag another as
unused.

svn path=/trunk/; revision=5387
2002-05-04 10:16:12 +00:00
Guy Harris b4971b39bf From Joerg Mayer:
In the "configure.in" files, add

		-D_U_="__attribute__((unused))"

	to CFLAGS if we're using GCC, and add

		-D_U_=""

	otherwise, so _U_ can be used to mark arguments as unused.

Add -D_U_="" arguments to the Makefile.nmake files as well, so _U_ works
with Microsoft Visual C++ as well.

Add comments and RCS IDs to the Makefile.nmake files that don't already
have them.

svn path=/trunk/; revision=4824
2002-02-27 09:42:52 +00:00
Guy Harris d4017a1ee1 Fix up some type/size problems that showed up when compiling on Digital
UNIX on Alpha.

svn path=/trunk/; revision=4635
2002-01-30 22:55:15 +00:00
Guy Harris 5027073407 From Hamish Moffatt:
Add some missing files in the "clean" targets.

	Use pod2html rather than man2html to build HTML man pages.

	Fix ethereal.nsi.in for recent versions of NSIS, and fix a typo.

svn path=/trunk/; revision=4475
2002-01-04 06:57:10 +00:00
Guy Harris 39362af814 From Motonori Shindo:
fix a bogus batch mode inference rule of make, so that
	"vc60.pdb" files are created in the proper directory;

	delete ".pdb" files in a "nmake -f Makefile.nmake clean";

	include the text2pcap and mergecap ".pdb" files in the Windows
	binary distribution.

svn path=/trunk/; revision=4385
2001-12-12 01:29:13 +00:00
Guy Harris f57a2329ec Remove "text2pcap-scanner.obj" and "tools\lemon\lemon.obj" when a "nmake
clean" is done.

svn path=/trunk/; revision=4188
2001-11-09 09:22:07 +00:00
Guy Harris 5881ffaf2a From Motonori Shindo: have CVS ignore some files generated by Win32
builds.

svn path=/trunk/; revision=3995
2001-10-04 21:08:11 +00:00
Guy Harris cc21ec8124 Do __attribute__ stuff if the GCC version number is greater than or
equal to 2, not just if it's equal to 2 - GCC 3.0 makes it 3, not 2....

svn path=/trunk/; revision=3765
2001-07-22 10:25:50 +00:00
Guy Harris 032f16e2eb If length arguments to "%*s" aren't of type "int", cast them to "int",
as that's what C requires them to be.

svn path=/trunk/; revision=3610
2001-06-26 20:52:19 +00:00
Guy Harris a39e4e8a5d Signed vs. unsigned fixes from Joerg Mayer.
svn path=/trunk/; revision=3372
2001-04-23 23:45:35 +00:00
Gilbert Ramirez 1ae90b3d24 nmake was compiling lemon.c twice; now let it use its default
rules, keeping it from over-compiling.

svn path=/trunk/; revision=3325
2001-04-18 04:55:36 +00:00
Gilbert Ramirez e79474408f Revert. MSVC is wrong. Thanks to Guy for pointing that out.
svn path=/trunk/; revision=3323
2001-04-18 04:52:51 +00:00
Gilbert Ramirez d61a474b93 Makefile.nmake pulls in settings from config.nmake
Move 'const' keyword to keep const qualifiers balanced... gets rid
of complaint from MSVC.

svn path=/trunk/; revision=3321
2001-04-18 03:02:57 +00:00
Guy Harris 64a43e1c0e Fixes to Lemon to get it to compile on platforms (such as some versions
of Tru64 UNIX) that define TRUE and FALSE.

Fixes to some Tru64 compiler warnings.

svn path=/trunk/; revision=3120
2001-03-09 04:35:25 +00:00
Gilbert Ramirez b864c8d80d Move the location of cppmagic.h, since the lemon-flex include files
require it. It makes more sense to either put cppmagic with lemon, or
in yet another common directory. I'll just put it with lemon.

svn path=/trunk/; revision=3083
2001-02-27 20:34:09 +00:00
Guy Harris 7a47c7ef24 Don't cast the function argument to "qsort()" to the expected type, make
the function have the expected type.

Make the arguments to comparison functions used by the merge sort be
"const void *", not "void *", just as the arguments to the comparison
functions used by "qsort()" are "const void *".

svn path=/trunk/; revision=3040
2001-02-15 09:25:38 +00:00
Guy Harris 352eec3037 More prototype fun - make the Lemon parser allocate and free routines
take fully-prototyped function arguments with types appropriate to
"g_malloc()" and "g_free()", and change the calls to the functions
pointed to by those arguments not pass the extra __FILE__ and __LINE__
arguments.

svn path=/trunk/; revision=3039
2001-02-15 06:22:46 +00:00
Guy Harris 6eaa148b30 More paranoia - when compiling with GCC 2.x, do checks of the format
string argument and subsequent arguments to "ErrorMsg()".

Fix up the bugs the checks in question found.

svn path=/trunk/; revision=3038
2001-02-15 06:08:23 +00:00
Guy Harris efabd03215 Change "lemon" *NOT* to cast pointers to "int", as that doesn't work on
LP64 platforms.

Change "lemon" to use function prototypes and the official ANSI C style
of variable-argument-list functions, and to include various system
header files rather than to use non-prototype declaration of various
system functions, to do a lot more type checking.

svn path=/trunk/; revision=3037
2001-02-15 06:01:23 +00:00
Guy Harris 3ce594a981 Add a "-f" flag to the "rm", so that "make clean" won't get an error
(and cause a higher-level "make clean" to stop) if any of the files to
be removed aren't there.

svn path=/trunk/; revision=2991
2001-02-04 19:44:24 +00:00
Gilbert Ramirez 95e09f5ac3 Add Makefile.nmake files for new subdirs.
Add them to EXTRA_DIST in corresponding Makefile.am's so that they
get packaged with the distribution.

svn path=/trunk/; revision=2979
2001-02-02 04:03:43 +00:00
Guy Harris d12fb1f952 Rename the "optarg()" and "opterr()" functions to "get_optarg()" and
"get_opterr()" so they don't collide with "getopt()"s "optarg" and
"opterr" globals (Solaris 2.6's <stdio.h> declares both "optarg" and
"opterr", causing "lemon.c" not to compile).

Define "safe_isXXX()" macros to call "isXXX()" after casting the
argument to "unsigned char" to handle characters with the 8th bit set.
Make some "int" variables used only to hold characters "char" instead.

svn path=/trunk/; revision=2970
2001-02-01 21:46:48 +00:00
Gilbert Ramirez 8f1fff2e6a Create a more modular type system for the FT_* types. Put them
into epan/ftypes.

Re-write display filter routines using Lemon parser instead of yacc.
Besides using a different tool, the new grammar is much simpler, while
the display filter engine itself is more powerful and more easily extended.

Add dftest executable, to test display filter "bytecode" generation.
Add option to "configure" to build dftest or randpkt, both of which are not
built by default.

Implement Ed Warnicke's ideas about dranges in the new display filter and
ftype code.

Remove type FT_TEXT_ONLY in favor of FT_NONE, and have protocols registered
as FT_PROTOCOL. Thus, FT_NONE is used only for simple labels in the proto tree,
while FT_PROTOCOL is used for protocols. This was necessary for being
able to make byte slices (ranges) out of protocols, like "frame[0:3]"

Win32 Makefile.nmake's will be added tonight.

svn path=/trunk/; revision=2967
2001-02-01 20:21:25 +00:00