Commit Graph

238 Commits

Author SHA1 Message Date
Alexis La Goutte c93ddddb6e Fix (-W)documentation found by Clang
Convert comment to doxygen type

Change-Id: Ib7adc2ece99dc4baa8ec3a349896dfa89277e00b
Reviewed-on: https://code.wireshark.org/review/84
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-03 13:11:14 +00:00
Anders Broman 451c30ef81 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54528
2014-01-01 12:17:57 +00:00
Gerald Combs 465e4664de Use "(void) <variable/>" to avoid unused variable warnings similar to
Qt's Q_UNUSED macro.

svn path=/trunk/; revision=54110
2013-12-14 23:44:25 +00:00
Guy Harris db25270df8 Move the epan/filesystem.c routines to wsutil; they're not specific to
packet dissection, they're specific to the entire Wireshark suite of
programs.

svn path=/trunk/; revision=53377
2013-11-17 02:55:14 +00:00
Guy Harris 6461057a52 Now that fvalue_to_string_repr() returns NULL if the fvalue's ftype has
no val_to_string_repr method, we don't need to check whether it has such
a method, and thus don't need to include epan/ftypes/ftypes-int.h.

svn path=/trunk/; revision=53293
2013-11-12 22:22:23 +00:00
Jakub Zawadzki ae59b09443 Add missing includes in order to remove exceptions.h from proto.h (next commit).
svn path=/trunk/; revision=53230
2013-11-10 15:59:37 +00:00
Jakub Zawadzki 12d1509aa1 Move struct _ftype_t + callback typedefs + free macro to ftypes-int.h
svn path=/trunk/; revision=53223
2013-11-10 13:14:09 +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
Alexis La Goutte b92f4ec821 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51678
2013-09-02 23:15:07 +00:00
Jakub Zawadzki 9cfac1227d Replace hfinfo pointer to same_name_prev, with same_name_prev_id.
svn path=/trunk/; revision=51175
2013-08-06 20:53:47 +00:00
Jakub Zawadzki 1a1360c2e1 Update plugins/ with recent change.
svn path=/trunk/; revision=50774
2013-07-21 23:26:07 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Evan Huus 53c6595bd9 Add our license header to plugin moduleinfo.h files. Cleans up a batch of
licensecheck warnings.

svn path=/trunk/; revision=50407
2013-07-06 13:31:31 +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
Bill Meier 1f083fd654 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachments #10423,#10424

svn path=/trunk/; revision=48450
2013-03-21 14:29:58 +00:00
Bill Meier 48af69f95f From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10409

svn path=/trunk/; revision=48449
2013-03-21 03:07:23 +00:00
Jaap Keuter 827eb58b04 From David Arnold:
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools.

svn path=/trunk/; revision=48261
2013-03-12 06:53:39 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Bill Meier 63f113d908 it's ==> its & its == > it's as needed.
svn path=/trunk/; revision=47893
2013-02-26 01:30:56 +00:00
Guy Harris 3b9b52e279 Get rid of an extra blank line.
svn path=/trunk/; revision=47677
2013-02-15 20:10:19 +00:00
Gilbert Ramirez 486c6d5445 Fix the grammar.h/grammar.c/grammar.lemon dependency so that
grammar.h is not always out of date. Use the same pattern as in the
Makefile.nmake files

svn path=/trunk/; revision=47643
2013-02-12 17:25:28 +00:00
Guy Harris ebacca89a7 Add %option noinput to a bunch of Flex files, as we aren't using the
input() routine and thus don't need to have it generated - and as it
produces warnings of a routine defined but not used, we don't want to
have it generated.

Squelch a casting-const-away warning.

svn path=/trunk/; revision=47613
2013-02-10 19:13:07 +00:00
Guy Harris 4824a391e8 Pull the definition of NODIST_HEADER_FILES up into
plugins/Makefile.common.inc.

svn path=/trunk/; revision=47596
2013-02-09 20:15:18 +00:00
Guy Harris c8af93ea2d Get rid of trailing tabs, make comments more similar.
svn path=/trunk/; revision=47593
2013-02-09 19:30:18 +00:00
Guy Harris ccadade242 Define GENERATED_HEADER_FILES in plugins/Makefile.common.inc.
svn path=/trunk/; revision=47592
2013-02-09 19:20:13 +00:00
Guy Harris 9c4e108387 plugins/Makefile.common.inc defines NODIST_SRC_FILES, and
plugins/mate/Makefile.common includes it, so there's no need to define
it in plugins/mate/Makefile.common.

svn path=/trunk/; revision=47591
2013-02-09 19:15:24 +00:00
Guy Harris df33477429 Define FLEX_GENERATED_SRC_FILES and LEMON_GENERATED_SRC_FILES in
plugins/Makefile.common.inc, and use it in plugins/mate/Makefile.nmake.

svn path=/trunk/; revision=47590
2013-02-09 19:11:14 +00:00
Guy Harris fa596409e0 plugins/Makefile.common.inc should already be defining
GENERATED_SRC_FILES, and plugins/mate/Makefile.common includes it, so it
shouldn't need to define GENERATED_SRC_FILES itself.

svn path=/trunk/; revision=47589
2013-02-09 18:54:27 +00:00
Anders Broman 3f00e454a5 Try to fix the makefiles to be able to build mate after distclean.
svn path=/trunk/; revision=47586
2013-02-09 16:34:51 +00:00
Guy Harris a52fedeece Stick NONGENERATED_ in the front of the macros listing non-generated
files.  Define C_FILES and CPP_FILES in Makefile.common.inc to include
*all* C and C++ files, respectively, including generated files.

svn path=/trunk/; revision=47557
2013-02-08 05:31:13 +00:00
Guy Harris ddd4e48890 We don't care what source files are "dissector" source files, we only
need to care whether source files should be scanned for registration
functions.

Reduce the number of macros we define in Makefile.common.inc, getting
rid of some only used internally.

svn path=/trunk/; revision=47556
2013-02-08 04:20:32 +00:00
Guy Harris ec02b35a9c -Werror needs to be applied only to clean files, not to, for example,
Flex-generated files.  Comment it out for now.

svn path=/trunk/; revision=47516
2013-02-06 10:24:50 +00:00
Guy Harris de2db00f04 Add -Werror if enabled.
Sort EXTRA_DIST.

svn path=/trunk/; revision=47515
2013-02-06 09:52:09 +00:00
Guy Harris c0afc1df76 Only remove Flex-generated files with "nmake distclean", not all
generated files.

Remove all generated files with "nmake maintainer-clean".

svn path=/trunk/; revision=47514
2013-02-06 09:51:33 +00:00
Guy Harris a7ae83ff95 Don't bother setting XXX_FILES to empty strings.
svn path=/trunk/; revision=47513
2013-02-06 09:50:38 +00:00
Guy Harris 4c99756f6e strtod() is locale-dependent; use g_ascii_strtod() instead.
If the intent is that floating-point representations be
locale-dependent, change this and somehow arrange that this not fail the
API test.  However, I doubt anybody's actually done anything that uses
this code path, given that...

...it was comparing a value against itself.  Fix it to use op->v.

svn path=/trunk/; revision=47512
2013-02-06 04:37:27 +00:00
Guy Harris 379a400c8f Don't run Lemon-generated header files through checkAPI, either (they
don't have an RCS ID, and they just define a pile of tokens).

svn path=/trunk/; revision=47511
2013-02-06 03:33:45 +00:00
Guy Harris af22672ed7 Do a bit more splitting and combining of file names, so that we can
avoid running the checkAPI stuff on Flex-generated files.

svn path=/trunk/; revision=47506
2013-02-06 02:30:08 +00:00
Guy Harris 39dd49ee2a mate_parser.obj depends on mate_grammar.h, as it's built from
mate_parser.c and mate_parser.c includes mate_grammar.h, so we need to
make sure mate_grammar.h is built before we try to compile
mate_parser.c.  However, mate_parser.obj isn't built by trying to
compile mate_grammar.h, so don't use $? in the $(CC) line, as that will
cause it to try to compile *all* the dependencies.

Add a comment to explain why mate_parser_lex.h depends on mate_parser.c.

svn path=/trunk/; revision=47504
2013-02-05 21:49:43 +00:00
Guy Harris c521263a6b Put NODIST_ at the beginning of macros containing NODIST, paralleling
the nodist_ convention for Automake variables.

Regularize the lists of source files, dividing them according to several
attributes.  Build composite lists in a plugins/Makefile.common.inc
file, to be included by plugin Makefile.common files, and use the
composite lists as appropriate in Makefile.am and Makefile.nmake.

svn path=/trunk/; revision=47502
2013-02-05 21:10:56 +00:00
Guy Harris 618e732f98 Don't forget the .c files that we *don't* distribute.
svn path=/trunk/; revision=47491
2013-02-05 09:11:37 +00:00
Guy Harris 68b610c304 mate_parser.c includes mate_grammar.h, so make mate_parser.obj depend on
mate_grammar.h.

svn path=/trunk/; revision=47490
2013-02-05 09:09:12 +00:00
Guy Harris 9eba2ea90a Don't distribute the results of running Lemon, as we distribute Lemon
ourselves.

Clean up various bits of "distribute" vs. "don't distribute" stuff in
the process - use similar names, and make the "distribute vs. don't
distribute" distinction the same as the "don't clean with "make
distclean" vs. clean with "make distclean"" distinction.

svn path=/trunk/; revision=47485
2013-02-05 06:09:17 +00:00
Gerald Combs 5130da6935 More silent build support.
svn path=/trunk/; revision=47472
2013-02-04 17:49:54 +00:00
Gerald Combs c0ca6220ef Prettify more build output.
svn path=/trunk/; revision=47469
2013-02-04 17:22:32 +00:00
Gerald Combs 8984a38512 Enable more build silence.
svn path=/trunk/; revision=47432
2013-02-01 22:13:43 +00:00
Gerald Combs c97b7912fa Go far enough down a rabbit hole and you will encounter libtool. See
if changing .o to .lo works.

svn path=/trunk/; revision=47430
2013-02-01 20:16:31 +00:00
Gerald Combs 34df2dbe54 Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fix
distcheck. Add some rules recommended by the Automake manual in order
to avoid duplicate actions.

svn path=/trunk/; revision=47429
2013-02-01 18:20:17 +00:00
Gerald Combs 9296fcc310 Fix more dependencies.
svn path=/trunk/; revision=47371
2013-01-30 20:32:44 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00