we're running from inside an OS X app bundle and, if we are, save the
pathname of the top-level bundle directory and use it to get the
pathnames of global data files, plugins, and Python modules.
This obviates the need to set special environment variables for them in
the launcher scripts, so get rid of the commands to do that.
The @rpathification of binaries also obviates the need for the
commented-out setting of DYLD_LIBRARY_PATH, so get rid of that as well.
svn path=/trunk/; revision=51306
consistency (they are called just once and will be inlined by any reasonable
compiler).
Also add some comments, fix some spacing etc. No functional changes.
svn path=/trunk/; revision=51304
doubly-linked list at the head of each block. This was intended as a step
towards supporting allocations bigger than the usual block size, but also shows
up as a 2% performance improvement in the speed test, so win-win.
svn path=/trunk/; revision=51298
Also tweak some ifdefs of function signatures. The multiple braces were
confusing my folder and my indenter, so ifdef *only* the changed parameters and
leave the bracing alone. This has the benefit of being a bit clearer too, I
think.
svn path=/trunk/; revision=51291
./packet-ldp.h:26:9: error: '__PACKET_LDP_H_' is used as a header guard here,
followed by #define of a different macro [-Werror,-Wheader-guard]
#ifndef __PACKET_LDP_H_
^~~~~~~~~~~~~~~
./packet-ldp.h:27:9: note: '__PACKET_LDP_H__' is defined here; did you mean
'__PACKET_LDP_H_'?
#define __PACKET_LDP_H__
^~~~~~~~~~~~~~~~
__PACKET_LDP_H_
svn path=/trunk/; revision=51285
./packet-idp.h:25:9: error: '__PACKET_IDP_H__' is used as a header guard here,
followed by #define of a different macro [-Werror,-Wheader-guard]
#ifndef __PACKET_IDP_H__
^~~~~~~~~~~~~~~~
./packet-idp.h:26:9: note: '__PACKET_IPX_H__' is defined here; did you mean
'__PACKET_IDP_H__'?
#define __PACKET_IPX_H__
^~~~~~~~~~~~~~~~
__PACKET_IDP_H__
svn path=/trunk/; revision=51284
../../epan/dissectors/packet-mpeg-sect.h:26:9: error: '__PACKET_MPEG_SECT_H_' is
used as a header guard here, followed by #define of a different macro
[-Werror,-Wheader-guard]
#ifndef __PACKET_MPEG_SECT_H_
^~~~~~~~~~~~~~~~~~~~~
../../epan/dissectors/packet-mpeg-sect.h:27:9: note: '__PACKET_MPEG_SECT_H__' is
defined here; did you mean '__PACKET_MPEG_SECT_H_'?
#define __PACKET_MPEG_SECT_H__
^~~~~~~~~~~~~~~~~~~~~~
__PACKET_MPEG_SECT_H_
svn path=/trunk/; revision=51283
./packet-osi-options.h:26:9: error: '_PACKET_OSI_OPTION_H' is used as a header
guard here, followed by #define of a different macro
[-Werror,-Wheader-guard]
#ifndef _PACKET_OSI_OPTION_H
^~~~~~~~~~~~~~~~~~~~
./packet-osi-options.h:27:9: note: '_PACKET_OSI_OPTIONS_H' is defined here; did
you mean '_PACKET_OSI_OPTION_H'?
#define _PACKET_OSI_OPTIONS_H
^~~~~~~~~~~~~~~~~~~~~
_PACKET_OSI_OPTION_H
svn path=/trunk/; revision=51282
./packet-bluetooth-hci.h:24:9: error: '__PACKET_BLUETOOTH_HCI_H__' is used as a
header guard here, followed by #define of a different macro
[-Werror,-Wheader-guard]
#ifndef __PACKET_BLUETOOTH_HCI_H__
^~~~~~~~~~~~~~~~~~~~~~~~~~
./packet-bluetooth-hci.h:25:9: note: '__PACKET_BLUETOOTH_HCI__H__' is defined
here; did you mean '__PACKET_BLUETOOTH_HCI_H__'?
#define __PACKET_BLUETOOTH_HCI__H__
^~~~~~~~~~~~~~~~~~~~~~~~~~~
__PACKET_BLUETOOTH_HCI_H__
svn path=/trunk/; revision=51281
packet-ucp.c:781:5: error: '\return' command used in a comment that is attached
to a function returning void [-Werror,-Wdocumentation]
* \return For 'int'-types, the value of the field.
~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
packet-ucp.c:954:17: error: parameter 'field' not found in the function
declaration [-Werror,-Wdocumentation]
* \param field The actual field, whose value needs displaying
^~~~~
svn path=/trunk/; revision=51270
packet-knet.c:466:5: error: '@return' command used in a comment that is attached
to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-knet.c:518:5: error: '@return' command used in a comment that is attached
to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-knet.c:677:5: error: '@return' command used in a comment that is attached
to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-knet.c:697:5: error: '@return' command used in a comment that is attached
to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-knet.c:717:5: error: '@return' command used in a comment that is attached
to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-knet.c:731:5: error: '@return' command used in a comment that is attached
to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
svn path=/trunk/; revision=51269
packet-jxta.c:1668:13: error: parameter 'names' not found in the function
declaration [-Werror,-Wdocumentation]
* @param names The table of names.
^~~~~
packet-jxta.c:1668:13: note: did you mean 'names_table'?
* @param names The table of names.
^~~~~
names_table
svn path=/trunk/; revision=51268
packet-eigrp.c:633:10: error: unrecognized parameter passing direction, valid
directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
* @param[in|out] tree detail dissection result
^~~~~~~~
packet-eigrp.c:638:5: error: '@return' command used in a comment that is
attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-eigrp.c:691:10: error: unrecognized parameter passing direction, valid
directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
* @param[in|out] tree detail dissection result
^~~~~~~~
packet-eigrp.c:696:5: error: '@return' command used in a comment that is
attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-eigrp.c:765:10: error: unrecognized parameter passing direction, valid
directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
* @param[in|out] tree detail dissection result
^~~~~~~~
packet-eigrp.c:769:5: error: '@return' command used in a comment that is
attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-eigrp.c:814:10: error: unrecognized parameter passing direction, valid
directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
* @param[in|out] tree detail dissection result
^~~~~~~~
packet-eigrp.c:818:5: error: '@return' command used in a comment that is
attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-eigrp.c:853:10: error: unrecognized parameter passing direction, valid
directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
* @param[in|out] tree detail dissection result
^~~~~~~~
packet-eigrp.c:857:5: error: '@return' command used in a comment that is
attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-eigrp.c:878:10: error: unrecognized parameter passing direction, valid
directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
* @param[in|out] tree detail dissection result
^~~~~~~~
packet-eigrp.c:882:19: error: empty paragraph passed to '@param' command
[-Werror,-Wdocumentation]
* @param[out] None
~~~~~~~~~~~~~~~^
packet-eigrp.c:884:5: error: '@return' command used in a comment that is
attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-eigrp.c:880:15: error: parameter 'pinfo' not found in the function
declaration [-Werror,-Wdocumentation]
* @param[in] pinfo general data about the protocol
^~~~~
packet-eigrp.c:881:15: error: parameter 'ti' not found in the function
declaration [-Werror,-Wdocumentation]
* @param[in] ti protocol item
^~
packet-eigrp.c:882:16: error: parameter 'None' not found in the function
declaration [-Werror,-Wdocumentation]
* @param[out] None
^~~~
packet-eigrp.c:902:19: error: empty paragraph passed to '@param' command
[-Werror,-Wdocumentation]
* @param[out] None
~~~~~~~~~~~~~~~^
packet-eigrp.c:904:5: error: '@return' command used in a comment that is
attached to a function returning void [-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
packet-eigrp.c:902:16: error: parameter 'None' not found in the function
declaration [-Werror,-Wdocumentation]
* @param[out] None
^~~~
packet-eigrp.c:1712:15: error: parameter 'pinfo' not found in the function
declaration [-Werror,-Wdocumentation]
* @param[in] pinfo general data about the protocol
^~~~~
packet-eigrp.c:1712:15: note: did you mean 'ti'?
* @param[in] pinfo general data about the protocol
^~~~~
ti
packet-eigrp.c:2585:18: error: empty paragraph passed to '@param' command
[-Werror,-Wdocumentation]
* @param[in] void
~~~~~~~~~~~~~~^
packet-eigrp.c:2585:15: error: parameter 'void' not found in the function
declaration [-Werror,-Wdocumentation]
* @param[in] void
^~~~
packet-eigrp.c:3324:18: error: empty paragraph passed to '@param' command
[-Werror,-Wdocumentation]
* @param[in] void
~~~~~~~~~~~~~~^
packet-eigrp.c:3324:15: error: parameter 'void' not found in the function
declaration [-Werror,-Wdocumentation]
* @param[in] void
^~~~
svn path=/trunk/; revision=51266
packet-9p.c:342:16: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
guint16 len; /*< Length of the string */
^~~
/**<
packet-9p.c:343:13: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
char *str; /*< The string */
^~~
/**<
packet-9p.c:364:15: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
guint8 type; /*< Type */
^~~
/**<
packet-9p.c:365:19: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
guint32 version; /*< Monotonically incrementing version number */
^~~
/**<
packet-9p.c:366:16: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
guint64 path; /*< Per-server-unique ID for a file system element */
^~~
/**<
5 errors generated
svn path=/trunk/; revision=51260
../../epan/wmem/wmem_user_cb.h:52:11: error: parameter 'allocator' not found in the function declaration
[-Werror,-Wdocumentation]
* @param allocator The allocator that triggered this callback.
^~~~~~~~~
../../epan/wmem/wmem_user_cb.h:53:11: error: parameter 'event' not found in the function declaration
[-Werror,-Wdocumentation]
* @param event The event type that triggered this callback.
^~~~~
../../epan/wmem/wmem_user_cb.h:54:11: error: parameter 'user_data' not found in the function declaration
[-Werror,-Wdocumentation]
* @param user_data Whatever user_data was originally passed to the call to
^~~~~~~~~
../../epan/wmem/wmem_user_cb.h:63:11: error: parameter 'recurring' not found in the function declaration
[-Werror,-Wdocumentation]
* @param recurring If this is FALSE then the callback is called exactly once.
^~~~~~~~~
4 errors generated.
svn path=/trunk/; revision=51259
../../epan/expert.h:176:9: warning: parameter 'pi' not found in the function declaration [-Wdocumentation]
@param pi Current protocol item (or NULL)
^~
../../epan/expert.h:176:9: note: did you mean 'tree'?
@param pi Current protocol item (or NULL)
^~
tree
../../epan/expert.h:195:9: warning: parameter 'pi' not found in the function declaration [-Wdocumentation]
@param pi Current protocol item (or NULL)
^~
2 warnings generated.
svn path=/trunk/; revision=51258
../../epan/range.h:87:11: error: empty paragraph passed to '@return' command [-Werror,-Wdocumentation]
* @return
~~~~~~~^
../../epan/range.h:86:11: error: parameter 'max_value'' not found in the function declaration [-Werror,-Wdocumentation]
* @param max_value' specifies the maximum value in a range.
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../epan/range.h:86:11: note: did you mean 'max_value'?
* @param max_value' specifies the maximum value in a range.
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
max_value
svn path=/trunk/; revision=51256
airpdcap.c:131:11: error: parameter 'password' not found in the function declaration [-Werror,-Wdocumentation]
* @param password [IN] pointer to a password (sequence of between 8 and
^~~~~~~~
airpdcap.c:154:11: error: parameter 'password' not found in the function declaration [-Werror,-Wdocumentation]
* @param password [IN] pointer to a password (sequence of between 8 and
^~~~~~~~
svn path=/trunk/; revision=51254
../../epan/emem.h:560:5: error: '@return' command used in a comment that is attached to a function returning void
[-Werror,-Wdocumentation]
* @return void
~^~~~~~~~~~~
svn path=/trunk/; revision=51253
This was the 4th patch, but also:
- use gmalloc0() to allocate vwr struct. Otherwise, valgrind says that
many of fields were still uninitialised when parse_s1_W_stats later
read them
- whitespace tidyup, got rid of remaining tabs and trailing whitespace
Did a fair bit of fuzz-testing without seeing any problems.
svn path=/trunk/; revision=51248
Guy Harris