[brlcad-commits] SF.net SVN: brlcad:[49252] brlcad/trunk
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <n_...@us...> - 2012-02-06 19:19:14
|
Revision: 49252 http://brlcad.svn.sourceforge.net/brlcad/?rev=49252&view=rev Author: n_reed Date: 2012-02-06 19:19:06 +0000 (Mon, 06 Feb 2012) Log Message: ----------- bu_sscanf should use scanf (not printf) syntax check. Substituted remaining instances of __BU* with _BU*. Modified Paths: -------------- brlcad/trunk/include/bu.h brlcad/trunk/src/librt/opennurbs_ext.h Modified: brlcad/trunk/include/bu.h =================================================================== --- brlcad/trunk/include/bu.h 2012-02-06 19:11:48 UTC (rev 49251) +++ brlcad/trunk/include/bu.h 2012-02-06 19:19:06 UTC (rev 49252) @@ -177,12 +177,12 @@ /** * shorthand declaration of a function that doesn't return */ -#define __BU_ATTR_NORETURN __attribute__ ((__noreturn__)) +#define _BU_ATTR_NORETURN __attribute__ ((__noreturn__)) /** * shorthand declaration of a function that should always be inline */ -#define __BU_ATTR_ALWAYS_INLINE __attribute__ ((always_inline)) +#define _BU_ATTR_ALWAYS_INLINE __attribute__ ((always_inline)) /** * If we're compiling strict, turn off "format string vs arguments" @@ -193,10 +193,12 @@ #if defined(STRICT_FLAGS) # undef _BU_ATTR_PRINTF12 # undef _BU_ATTR_PRINTF23 -# undef __BU_ATTR_NORETURN +# undef _BU_ATTR_SCANF23 +# undef _BU_ATTR_NORETURN # define _BU_ATTR_PRINTF12 # define _BU_ATTR_PRINTF23 -# define __BU_ATTR_NORETURN +# define _BU_ATTR_SCANF23 +# define _BU_ATTR_NORETURN #endif @@ -2766,7 +2768,7 @@ * This routine should never return unless there is a bu_setjmp * handler registered. */ -BU_EXPORT extern void bu_bomb(const char *str) __BU_ATTR_NORETURN; +BU_EXPORT extern void bu_bomb(const char *str) _BU_ATTR_NORETURN; /** * Semi-graceful termination of the application that doesn't cause a @@ -2780,7 +2782,7 @@ * * This routine should never return. */ -BU_EXPORT extern void bu_exit(int status, const char *fmt, ...) __BU_ATTR_NORETURN _BU_ATTR_PRINTF23; +BU_EXPORT extern void bu_exit(int status, const char *fmt, ...) _BU_ATTR_NORETURN _BU_ATTR_PRINTF23; /** @file libbu/crashreport.c * @@ -3624,7 +3626,7 @@ /** * Initializes the va_list, then calls the above bu_vsscanf. */ -BU_EXPORT extern int bu_sscanf(const char *src, const char *fmt, ...) _BU_ATTR_PRINTF23; +BU_EXPORT extern int bu_sscanf(const char *src, const char *fmt, ...) _BU_ATTR_SCANF23; /** @} */ Modified: brlcad/trunk/src/librt/opennurbs_ext.h =================================================================== --- brlcad/trunk/src/librt/opennurbs_ext.h 2012-02-06 19:11:48 UTC (rev 49251) +++ brlcad/trunk/src/librt/opennurbs_ext.h 2012-02-06 19:19:06 UTC (rev 49252) @@ -219,7 +219,7 @@ template<class BA> inline -__BU_ATTR_ALWAYS_INLINE +_BU_ATTR_ALWAYS_INLINE BANode<BA>::BANode(const ON_Curve* curve, int adj_face_index, const BA& node, const ON_BrepFace* face, const ON_Interval& t, bool innerTrim, bool checkTrim, bool trimmed) @@ -263,7 +263,7 @@ template<class BA> inline -__BU_ATTR_ALWAYS_INLINE +_BU_ATTR_ALWAYS_INLINE BANode<BA>::BANode(const BA& node) : m_node(node) { m_adj_face_index = -99; @@ -357,7 +357,7 @@ template<class BA> inline void -__BU_ATTR_ALWAYS_INLINE +_BU_ATTR_ALWAYS_INLINE BANode<BA>::GetBBox(double* min, double* max) const { VSETALL(min, MAX_FASTF); @@ -914,7 +914,7 @@ template<class BV> inline -__BU_ATTR_ALWAYS_INLINE +_BU_ATTR_ALWAYS_INLINE BVNode<BV>::BVNode(CurveTree* ct, const BV& node, const ON_BrepFace* face, const ON_Interval& u, const ON_Interval& v, bool checkTrim, bool trimmed) : m_ctree(ct), m_node(node), m_face(face), m_u(u), m_v(v), m_checkTrim(checkTrim), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |