Commit Graph

176 Commits

Author SHA1 Message Date
Evan Huus 37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26: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
Guy Harris e30d2b5001 Make the other plugin makefiles use the new style introduced in the MATE
makefiles.

svn path=/trunk/; revision=47579
2013-02-09 05:31:15 +00:00
Guy Harris 3dfac15921 Another 64-bit-to-32-bit warning on 32-bit platforms.
svn path=/trunk/; revision=46781
2012-12-26 12:28:40 +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
Bill Meier 7cd0417af5 Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).

svn path=/trunk/; revision=46402
2012-12-05 15:56:36 +00:00
Jeff Morriss 3551a86c36 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45015
2012-09-20 01:29:52 +00:00
Chris Maynard b1aba30a79 Fix Coverity CID's 712344-712345: Unused pointer value.
svn path=/trunk/; revision=44135
2012-07-30 13:24:27 +00:00
Jörg Mayer 3bfda44ae0 Fix two "set but unused variable" warnings turning errors:
- Comment out hdrbits, it's retrieved but not used (slightly different
  approach to overwritten patch)
- Change two instances of pt to tree as this *may* have been
  the intention

svn path=/trunk/; revision=44061
2012-07-27 07:23:01 +00:00
Anders Broman fc192f4c57 Remove unused variable, use the created subtree. Found by buildbot.
svn path=/trunk/; revision=44059
2012-07-27 07:12:55 +00:00
Jeff Morriss 0183bd93fc You can't (well, shouldn't) reference and modify a given variable multiple
times in one C statement: the order of references and modifications is
undefined.  Anyway I don't think the modification is intentional: just divide
instead of divide-and-assign.

Also remove what looks to be some test code (only executed for frame number
11).

svn path=/trunk/; revision=44056
2012-07-26 20:57:42 +00:00
Michael Mann 44aabbdf14 Converted many proto_tree_add_text -> proto_tree_add_item (or at least something that's filterable). since Gryphon is used as the flagship example for plugins, I don't want developers to get the impression proto_tree_add_text is the way to add fields in Wireshark. Hopefully this will reduce the number of dissectors submitted with too many proto_tree_add_text()s.
svn path=/trunk/; revision=44055
2012-07-26 20:14:53 +00:00
Jakub Zawadzki b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +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
Bill Meier 3d4b3f2784 Set Makefile.common as a plugin.c dependency so plugin.c is rebuilt if Makefile.common is changed
svn path=/trunk/; revision=42972
2012-06-01 14:44:35 +00:00
Bill Meier 1caa79ad80 Windows: Set Makefile.common as a plugin.c dependency so plugin.c is rebuilt if Makefile.common is changed
ToDo: ditto for Makefile.am ?

svn path=/trunk/; revision=42971
2012-06-01 14:08:12 +00:00
Guy Harris 66ee0608c7 The message length isn't needed in cmd_sched_rep() - it's just the
containing packet length, so if we go past it, we'll get an exception
thrown.  Get rid of it.

The answer to "Should msglen be returned instead of offset?" is "no" -
the command dissectors return the new offset.

Get rid of an unused - and unnecessary - variable.

svn path=/trunk/; revision=42367
2012-04-30 23:03:51 +00:00
Gerald Combs c40f94895d Fix a couple of clang warnings and adjust capitalization.
svn path=/trunk/; revision=42358
2012-04-30 20:15:46 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Anders Broman 8e97665863 Add *.sbr files to the clean target.
svn path=/trunk/; revision=40761
2012-01-29 20:03:39 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier f161dc95fa Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38150
2011-07-21 19:10:10 +00:00
Bill Meier e07cb22a47 Rework whitespace.
svn path=/trunk/; revision=36583
2011-04-12 14:33:30 +00:00
Bill Meier c424bd7c83 Don't assign to a proto_item * if the value won't be used: Coverity 1158 & 1159.
svn path=/trunk/; revision=36581
2011-04-12 13:27:08 +00:00
Bill Meier e3f4dc17a9 localtime() can return a NULL ptr.
svn path=/trunk/; revision=36580
2011-04-12 13:21:32 +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
Jeff Morriss f53744b59d There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
   
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string().

svn path=/trunk/; revision=35603
2011-01-21 03:00:31 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Stig Bjørlykke 1f2f2e918e Simply use %c for printing char.
svn path=/trunk/; revision=34789
2010-11-05 09:59:40 +00:00
Stig Bjørlykke 75c2052a01 Fixed a printf modifier to remove a warning from clang.
svn path=/trunk/; revision=34784
2010-11-05 08:04:24 +00:00
Guy Harris ac3ac6c476 Plugins are not shared libraries, so:
1) don't set thei SOVERSION - run-time-loaded modules don't have
	   an SOVERSION;

	2) build them with link mode MODULE, not SHARED, on all
	   platforms.

(Fixing 1) also fixes the problem with building them as MODULE on OS X.)

svn path=/trunk/; revision=34243
2010-09-24 20:41:34 +00:00
Jörg Mayer de68ad3066 H. Sivank <hsivank@gmail.com>
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.


svn path=/trunk/; revision=34201
2010-09-23 07:02:33 +00:00
Jaap Keuter eb6efdc4a4 Synchronize Makefiles even more.
svn path=/trunk/; revision=32808
2010-05-14 16:48:17 +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
Anders Broman 7cfa27b04b Get rid of a bunch of check_col().
svn path=/trunk/; revision=32388
2010-04-05 20:04:52 +00:00
Jörg Mayer 96779de920 cmake changes:
- Add checking for linker flags
- Install plugins with the name including the Wireshark version.
  This will make it easier to find matching plugin versions if
  files get just copied over.


svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
Jörg Mayer 67072286bf - Remove the lib prefix for plugin names.
- Remove a (resolved) comment.
- Add a commented out line how to add version infos to the
  plugin's file name.

svn path=/trunk/; revision=31995
2010-02-24 22:32:10 +00:00
Bill Meier 1341fcd87e Fix some gcc -Wshadow warnings.
svn path=/trunk/; revision=31722
2010-01-28 21:49:30 +00:00
Jörg Mayer d2cc318f4f Beginnings of enabling static builds. Still to do:
* Add -static
* Registration may need different handling
* Add plugins
* Build error in wslua

svn path=/trunk/; revision=30987
2009-11-17 11:58:36 +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
Kovarththanan Rajaratnam 8b8399b711 Use register_dissector_files in the plugins dissectors
svn path=/trunk/; revision=30435
2009-10-09 16:39:34 +00:00
Stig Bjørlykke cf85342eec Build plugins with cmake on OSX.
svn path=/trunk/; revision=30373
2009-10-06 18:58:09 +00:00
Jörg Mayer 95182116aa CMake:
- Add opcua to the list of plugins to build
- Link the gtk stuff statically into wireshark
- Beginnings of "make install"
- Change a few things about install paths

svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
Kovarththanan Rajaratnam 9441e9b344 Use tvb_get_ephemeral_stringz() instead of tvb_get_stringz()
svn path=/trunk/; revision=30002
2009-09-20 08:40:01 +00:00
Jörg Mayer 5a2247f5a3 Build a few more plugins
svn path=/trunk/; revision=29942
2009-09-16 06:30:03 +00:00
Jeff Morriss 4661aad9a4 Run checkapi on the dissector header files
svn path=/trunk/; revision=29883
2009-09-13 19:48:22 +00:00
Kovarththanan Rajaratnam 2547ce21bf We no longer support the old plugin API so remove it completely from the build system
svn path=/trunk/; revision=29821
2009-09-09 14:01:57 +00:00
Bill Meier 6f87844d0a (Minor) Remove unneeded #includes.
svn path=/trunk/; revision=29492
2009-08-21 14:36:27 +00:00
Kovarththanan Rajaratnam 0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00