Changeset 14452
- Timestamp:
- Aug 8, 2007, 3:40:08 PM (19 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 35 edited
-
astro/psCoord.h (modified) (7 diffs)
-
astro/psEarthOrientation.h (modified) (2 diffs)
-
astro/psSphereOps.h (modified) (2 diffs)
-
astro/psTime.h (modified) (2 diffs)
-
db/psDB.h (modified) (5 diffs)
-
imageops/psImageBinning.h (modified) (2 diffs)
-
imageops/psImageConvolve.h (modified) (2 diffs)
-
imageops/psImageInterpolate.h (modified) (2 diffs)
-
jpeg/psImageJpeg.h (modified) (2 diffs)
-
math/psClip.h (modified) (2 diffs)
-
math/psHistogram.h (modified) (2 diffs)
-
math/psMinimizeLMM.h (modified) (3 diffs)
-
math/psPolynomial.h (modified) (5 diffs)
-
math/psPolynomialMetadata.h (modified) (5 diffs)
-
math/psRandom.h (modified) (2 diffs)
-
math/psSparse.h (modified) (3 diffs)
-
math/psSpline.h (modified) (2 diffs)
-
math/psStats.h (modified) (2 diffs)
-
mathtypes/psImage.h (modified) (2 diffs)
-
mathtypes/psScalar.h (modified) (2 diffs)
-
mathtypes/psVector.h (modified) (3 diffs)
-
sys/psAbort.h (modified) (3 diffs)
-
sys/psError.h (modified) (6 diffs)
-
sys/psLine.h (modified) (3 diffs)
-
sys/psLogMsg.h (modified) (2 diffs)
-
sys/psString.h (modified) (6 diffs)
-
sys/psTrace.h (modified) (2 diffs)
-
sys/psType.h (modified) (2 diffs)
-
types/psArray.h (modified) (2 diffs)
-
types/psBitSet.h (modified) (2 diffs)
-
types/psHash.h (modified) (2 diffs)
-
types/psList.h (modified) (3 diffs)
-
types/psLookupTable.h (modified) (2 diffs)
-
types/psMetadata.h (modified) (4 diffs)
-
types/psPixels.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astro/psCoord.h
r13839 r14452 8 8 * @author GLG, MHPCC 9 9 * 10 * @version $Revision: 1.6 0$ $Name: not supported by cvs2svn $11 * @date $Date: 2007-0 6-15 01:03:22$10 * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2007-08-09 01:40:07 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 157 157 * @return psPlane* resulting plane structure. 158 158 */ 159 psPlane* psPlaneAlloc(void) ;159 psPlane* psPlaneAlloc(void) PS_ATTR_MALLOC; 160 160 161 161 /** Allocates a psSphere … … 163 163 * @return psSphere* resulting sphere structure. 164 164 */ 165 psSphere* psSphereAlloc(void) ;165 psSphere* psSphereAlloc(void) PS_ATTR_MALLOC; 166 166 167 167 /** Allocates a psCube … … 169 169 * @return psCube* resulting cubic structure. 170 170 */ 171 psCube* psCubeAlloc(void) ;171 psCube* psCubeAlloc(void) PS_ATTR_MALLOC; 172 172 173 173 /** Allocates a psPlaneTransform transform. … … 179 179 int order1, ///< The order of the x term in the transform. 180 180 int order2 ///< The order of the y term in the transform. 181 ) ;181 ) PS_ATTR_MALLOC; 182 182 183 183 /** Applies the psPlaneTransform transform to a specified coordinate … … 201 201 int order3, ///< The order of the y term in the transform. 202 202 int order4 ///< The order of the z term in the transform. 203 ) ;203 ) PS_ATTR_MALLOC; 204 204 205 205 … … 226 226 double Ys, ///< Scale in y-dimension 227 227 psProjectionType type 228 ) ;228 ) PS_ATTR_MALLOC; 229 229 230 230 /** Checks the type of a particular pointer. -
trunk/psLib/src/astro/psEarthOrientation.h
r12432 r14452 8 8 * @author Robert Daniel DeSonia, MHPCC 9 9 * 10 * @version $Revision: 1.1 8$ $Name: not supported by cvs2svn $11 * @date $Date: 2007-0 3-14 02:31:41$10 * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2007-08-09 01:40:07 $ 12 12 * 13 13 * Copyright 2005 Maui High Performance Computing Center, University of Hawaii … … 63 63 64 64 /** Allocates a new psEarthPole structure. */ 65 psEarthPole *psEarthPoleAlloc(void) ;65 psEarthPole *psEarthPoleAlloc(void) PS_ATTR_MALLOC; 66 66 67 67 /** Calculates the apparent position of a star, given its actual position and the -
trunk/psLib/src/astro/psSphereOps.h
r11248 r14452 6 6 * @author David Robbins, MHPCC 7 7 * 8 * @version $Revision: 1.1 2$ $Name: not supported by cvs2svn $9 * @date $Date: 2007-0 1-23 22:47:22$8 * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2007-08-09 01:40:07 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 69 69 double deltaP, ///< north pole longitude 70 70 double phiP ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares). 71 ) ;71 ) PS_ATTR_MALLOC; 72 72 73 73 /** Checks the type of a particular pointer. -
trunk/psLib/src/astro/psTime.h
r13950 r14452 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.5 6$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-0 6-22 02:28:48$13 * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-08-09 01:40:07 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 108 108 psTime* psTimeAlloc( 109 109 psTimeType type ///< Type of time to create (UTC or TAI). 110 ) ;110 ) PS_ATTR_MALLOC; 111 111 112 112 -
trunk/psLib/src/db/psDB.h
r12128 r14452 7 7 * @author Joshua Hoblitt 8 8 * 9 * @version $Revision: 1.3 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 3-01 03:57:08$9 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-08-09 01:40:07 $ 11 11 * 12 12 * Copyright 2005 Joshua Hoblitt, University of Hawaii … … 45 45 const char *dbname, ///< Database namespace 46 46 unsigned int port ///< Database port number 47 ) ;47 ) PS_ATTR_MALLOC; 48 48 49 49 /** Opens a new database connection … … 115 115 * @return bool: true on success 116 116 */ 117 #ifdef __GNUC__118 117 bool p_psDBRunQuery( 119 118 psDB *dbh, ///< Database handle 120 119 const char *format, ///< SQL string to execute 121 120 ... ///< Arguments for name formatting and metadata item data. 122 ) __attribute__((format(printf, 2, 3))); 123 124 #else // __GNUC__ 125 bool p_psDBRunQuery( 126 psDB *dbh, ///< Database handle 127 const char *format, ///< SQL string to execute 128 ... ///< Arguments for name formatting and metadata item data. 129 ); 130 #endif // __GNUC__ 121 ) PS_ATTR_FORMAT(printf, 2, 3); 131 122 132 123 /** Executes a SQL query as a prepared statement … … 138 129 * @return long: the number of database rows affected 139 130 */ 140 #ifdef __GNUC__141 131 long p_psDBRunQueryPrepared( 142 132 psDB *dbh, ///< Database handle … … 144 134 const char *format, ///< SQL string to execute 145 135 ... 146 ) __attribute__((format(printf, 3, 4))); 147 #else // __GNUC__ 148 long p_psDBRunQueryPrepared( 149 psDB *dbh, ///< Database handle 150 const psArray *rowSet, ///< row data as psArray of psMetadata 151 const char *format, ///< SQL string to execute 152 ... 153 ); 154 #endif // __GNUC__ 136 ) PS_ATTR_FORMAT(printf, 3, 4); 155 137 156 138 /** Fetches the result of a SQL query -
trunk/psLib/src/imageops/psImageBinning.h
r12588 r14452 8 8 * @author Eugene Magnier, IfA 9 9 * 10 * @version $Revision: 1. 1$ $Name: not supported by cvs2svn $11 * @date $Date: 2007-0 3-27 02:43:22$10 * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2007-08-09 01:40:07 $ 12 12 * 13 13 * Copyright 2007 Institute for Astronomy, University of Hawaii … … 42 42 43 43 44 psImageBinning *psImageBinningAlloc() ;44 psImageBinning *psImageBinningAlloc() PS_ATTR_MALLOC; 45 45 46 46 void psImageBinningSetRuffSize(psImageBinning *binning, psImageBinningAlign align); -
trunk/psLib/src/imageops/psImageConvolve.h
r14332 r14452 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.2 1$ $Name: not supported by cvs2svn $8 * @date $Date: 2007-0 7-20 20:12:31$7 * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2007-08-09 01:40:07 $ 9 9 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 10 10 */ … … 68 68 int yMin, ///< Most negative y index 69 69 int yMax ///< Most positive y index 70 ) ;70 ) PS_ATTR_MALLOC; 71 71 72 72 /// Checks the type of a particular pointer. -
trunk/psLib/src/imageops/psImageInterpolate.h
r13483 r14452 7 7 * @author Paul Price, Institute for Astronomy 8 8 * 9 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 5-23 02:55:01$9 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-08-09 01:40:07 $ 11 11 * Copyright 2004-2007 Institute for Astronomy, University of Hawaii 12 12 */ … … 67 67 psMaskType poorMask, // Mask value for poor pixels 68 68 float poorFrac // Fraction of flux for question 69 ) ;69 ) PS_ATTR_MALLOC; 70 70 71 71 -
trunk/psLib/src/jpeg/psImageJpeg.h
r11248 r14452 3 3 * 4 4 * @author EAM 5 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $6 * @date $Date: 2007-0 1-23 22:47:23$5 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 6 * @date $Date: 2007-08-09 01:40:07 $ 7 7 */ 8 8 … … 28 28 29 29 // allocate a colormap (does not define the map values) 30 psImageJpegColormap *psImageJpegColormapAlloc() ;30 psImageJpegColormap *psImageJpegColormapAlloc() PS_ATTR_MALLOC; 31 31 32 32 // set the colormap values using the supplied name -
trunk/psLib/src/math/psClip.h
r13448 r14452 4 4 * @author Paul Price, IfA. 5 5 * 6 * $Revision: 1. 4$ $Name: not supported by cvs2svn $7 * $Date: 2007-0 5-21 21:50:34$6 * $Revision: 1.5 $ $Name: not supported by cvs2svn $ 7 * $Date: 2007-08-09 01:40:07 $ 8 8 * Copyright 2007 Institute for Astronomy, University of Hawaii 9 9 */ … … 37 37 psMaskType masked, ///< Mask value for entries already masked 38 38 psMaskType clipped ///< Mask value to give to clipped entries 39 ) ;39 ) PS_ATTR_MALLOC; 40 40 41 41 -
trunk/psLib/src/math/psHistogram.h
r11759 r14452 7 7 * @author GLG, MHPCC 8 8 * 9 * @version $Revision: 1. 3$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 2-13 03:01:24$9 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-08-09 01:40:07 $ 11 11 * 12 12 * Copyright 2004-2005 IfA, University of Hawaii … … 52 52 float upper, ///< Upper limit for the bins 53 53 int n ///< Number of bins 54 ) ;54 ) PS_ATTR_MALLOC; 55 55 56 56 -
trunk/psLib/src/math/psMinimizeLMM.h
r14320 r14452 7 7 * @author GLG, MHPCC 8 8 * 9 * @version $Revision: 1.1 1$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 7-20 00:22:24$9 * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-08-09 01:40:07 $ 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 12 12 */ … … 94 94 psMinConstraint; 95 95 96 psMinConstraint *psMinConstraintAlloc() ;96 psMinConstraint *psMinConstraintAlloc() PS_ATTR_MALLOC; 97 97 98 98 /** Allocates a psMinimization structure. … … 103 103 int maxIter, ///< Number of minimization iterations to perform. 104 104 float tol ///< Requested error tolerance 105 ) ;105 ) PS_ATTR_MALLOC; 106 106 107 107 /* Checks the type of a particular pointer. -
trunk/psLib/src/math/psPolynomial.h
r11248 r14452 8 8 * @author GLG, MHPCC 9 9 * 10 * @version $Revision: 1.6 7$ $Name: not supported by cvs2svn $11 * @date $Date: 2007-0 1-23 22:47:23$10 * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2007-08-09 01:40:07 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 111 111 psPolynomialType type, ///< Polynomial Type 112 112 unsigned int nX ///< Number of terms 113 ) ;113 ) PS_ATTR_MALLOC; 114 114 115 115 /** Allocates a 2-D polynomial structure … … 121 121 unsigned int nX, ///< Number of terms in x 122 122 unsigned int nY ///< Number of terms in y 123 ) ;123 ) PS_ATTR_MALLOC; 124 124 125 125 /** Allocates a 3-D polynomial structure … … 132 132 unsigned int nY, ///< Number of terms in y 133 133 unsigned int nZ ///< Number of terms in z 134 ) ;134 ) PS_ATTR_MALLOC; 135 135 136 136 /** Allocates a 4-D polynomial structure … … 144 144 unsigned int nZ, ///< Number of terms in z 145 145 unsigned int nT ///< Number of terms in t 146 ) ;146 ) PS_ATTR_MALLOC; 147 147 148 148 bool psPolynomial2DRecycle(psPolynomial2D *poly, -
trunk/psLib/src/math/psPolynomialMetadata.h
r14415 r14452 8 8 * @author GLG, MHPCC 9 9 * 10 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $11 * @date $Date: 2007-08-0 7 00:03:00$10 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2007-08-09 01:40:07 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 51 51 const char *format, ///< Name of polynomial folder. 52 52 ... ///< Arguments for name formatting. 53 ) 54 #ifdef __GNUC__ 55 __attribute__((format(printf,3,4))) 56 #endif 57 ; 53 ) PS_ATTR_FORMAT(printf,3,4); 58 54 59 55 /** Allocates a new psPolynomial2D structure with information from a psMetadata. … … 88 84 const char *format, ///< Name of polynomial folder. 89 85 ... ///< Arguments for name formatting. 90 ) 91 #ifdef __GNUC__ 92 __attribute__((format(printf,3,4))) 93 #endif 94 ; 86 ) PS_ATTR_FORMAT(printf,3,4); 95 87 96 88 /** Allocates a new psPolynomial3D structure with information from a psMetadata. … … 126 118 const char *format, ///< Name of polynomial folder. 127 119 ... ///< Arguments for name formatting. 128 ) 129 #ifdef __GNUC__ 130 __attribute__((format(printf,3,4))) 131 #endif 132 ; 120 ) PS_ATTR_FORMAT(printf, 3, 4); 133 121 134 122 /** Allocates a new psPolynomial4D structure with information from a psMetadata. … … 164 152 const char *format, ///< Name of polynomial folder. 165 153 ... ///< Arguments for name formatting. 166 ) 167 #ifdef __GNUC__ 168 __attribute__((format(printf,3,4))) 169 #endif 170 ; 154 ) PS_ATTR_FORMAT(printf, 3, 4); 171 155 172 156 /// @} -
trunk/psLib/src/math/psRandom.h
r11248 r14452 7 7 * @author GLG, MHPCC 8 8 * 9 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 1-23 22:47:23$9 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-08-09 01:40:07 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 53 53 psRandomType type, ///< The type of RNG 54 54 unsigned long seed ///< Known value with which to seed the RNG 55 ) ;55 ) PS_ATTR_MALLOC; 56 56 57 57 /** Resets an existing psRandom struct. -
trunk/psLib/src/math/psSparse.h
r11248 r14452 2 2 * @brief functions to manipulate sparse matrices equations 3 3 * 4 * $Revision: 1. 8$ $Name: not supported by cvs2svn $5 * $Date: 2007-0 1-23 22:47:23$4 * $Revision: 1.9 $ $Name: not supported by cvs2svn $ 5 * $Date: 2007-08-09 01:40:07 $ 6 6 * Copyright 2004-2005 IfA, University of Hawaii 7 7 */ … … 50 50 51 51 // allocate a sparse matrix structure 52 psSparse *psSparseAlloc(int Nrows, int Nelem) ;52 psSparse *psSparseAlloc(int Nrows, int Nelem) PS_ATTR_MALLOC; 53 53 54 54 // add a new matrix element … … 85 85 86 86 // allocate a sparse matrix structure 87 psSparseBorder *psSparseBorderAlloc(psSparse *sparse, int Nborder) ;87 psSparseBorder *psSparseBorderAlloc(psSparse *sparse, int Nborder) PS_ATTR_MALLOC; 88 88 89 89 bool psSparseBorderElementT(psSparseBorder *border, int i, int j, float value); -
trunk/psLib/src/math/psSpline.h
r11248 r14452 7 7 * @author GLG, MHPCC 8 8 * 9 * @version $Revision: 1.6 1$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 1-23 22:47:23$9 * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-08-09 01:40:07 $ 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 12 12 */ … … 46 46 * @return psSpline1D* new 1-D spline struct 47 47 */ 48 psSpline1D *psSpline1DAlloc() ;48 psSpline1D *psSpline1DAlloc() PS_ATTR_MALLOC; 49 49 50 50 /** Evaluates 1-D spline polynomials at a specific coordinate. -
trunk/psLib/src/math/psStats.h
r14429 r14452 8 8 * @author GLG, MHPCC 9 9 * 10 * @version $Revision: 1.6 1$ $Name: not supported by cvs2svn $11 * @date $Date: 2007-08-0 8 19:38:17 $10 * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2007-08-09 01:40:07 $ 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 13 13 */ … … 116 116 const char *func, ///< Function name of caller 117 117 psStatsOptions options ///< Statistics to calculate 118 ) ;118 ) PS_ATTR_MALLOC; 119 119 #define psStatsAlloc(options) \ 120 120 p_psStatsAlloc(__FILE__, __LINE__, __func__, options) -
trunk/psLib/src/mathtypes/psImage.h
r12813 r14452 9 9 * @author Joshua Hoblitt, University of Hawaii 10 10 * 11 * @version $Revision: 1.9 3$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 4-12 18:52:57 $11 * @version $Revision: 1.94 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-08-09 01:40:07 $ 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 14 14 */ … … 89 89 int numRows, ///< Number of rows in image. 90 90 psElemType type ///< Type of data for image. 91 ) ;91 ) PS_ATTR_MALLOC; 92 92 #define psImageAlloc(numCols, numRows, type) \ 93 93 p_psImageAlloc(__FILE__, __LINE__, __func__, numCols, numRows, type) -
trunk/psLib/src/mathtypes/psScalar.h
r12431 r14452 8 8 * @author Joshua Hoblitt, University of Hawaii 9 9 * 10 * @version $Revision: 1.2 3$ $Name: not supported by cvs2svn $11 * @date $Date: 2007-0 3-14 00:39:51$10 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2007-08-09 01:40:07 $ 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 13 13 */ … … 70 70 double value, ///< Data to be put into psScalar 71 71 psElemType type ///< Type of data to be held by psScalar 72 ) ;72 ) PS_ATTR_MALLOC; 73 73 #define psScalarAlloc(value, type) \ 74 74 p_psScalarAlloc(__FILE__, __LINE__, __func__, value, type) -
trunk/psLib/src/mathtypes/psVector.h
r14267 r14452 10 10 * @author Joshua Hoblitt, University of Hawaii 11 11 * 12 * @version $Revision: 1.6 8$ $Name: not supported by cvs2svn $13 * @date $Date: 2007-0 7-17 20:32:02$12 * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2007-08-09 01:40:07 $ 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 15 15 */ … … 90 90 long nalloc, ///< Total number of elements to make available. 91 91 psElemType type ///< Type of data to be held by vector. 92 //#ifdef __GNUC__ 93 //) __attribute__((malloc)); 94 //#else // ifdef __GNUC__ 95 ); 96 //#endif // ifdef __GNUC__ 92 ) PS_ATTR_MALLOC; 97 93 #define psVectorAlloc(nalloc, type) \ 98 94 p_psVectorAlloc(__FILE__, __LINE__, __func__, nalloc, type) … … 119 115 long nalloc, ///< Total number of elements to make available. 120 116 psElemType type ///< Type of data to be held by vector. 121 //#ifdef __GNUC__ 122 //) __attribute__((malloc)); 123 //#else // ifdef __GNUC__ 124 ); 125 //#endif // ifdef __GNUC__ 117 ) PS_ATTR_MALLOC; 126 118 #define psVectorAllocEmpty(nalloc, type) \ 127 119 p_psVectorAllocEmpty(__FILE__, __LINE__, __func__, nalloc, type) -
trunk/psLib/src/sys/psAbort.h
r11686 r14452 10 10 * @author Joshua Hoblitt, University of Hawaii 11 11 * 12 * $Revision: 1.1 4$ $Name: not supported by cvs2svn $13 * $Date: 2007-0 2-07 23:52:54$12 * $Revision: 1.15 $ $Name: not supported by cvs2svn $ 13 * $Date: 2007-08-09 01:40:07 $ 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 15 15 */ … … 22 22 23 23 #include <stdarg.h> 24 25 #include "psType.h" 24 26 25 27 /** Reports an abort message to logging facility … … 45 47 const char *format, ///< A printf style formatting statement 46 48 ... 47 #ifdef __GNUC__ 48 ) __attribute__((format(printf, 4, 5), noreturn)); 49 #else // ifdef __GNUC__ 50 ); 51 #endif // ifdef __GNUC__ 49 ) PS_ATTR_FORMAT(printf, 4, 5) PS_ATTR_NORETURN; 52 50 #ifndef SWIG 53 51 #define psAbort(...) \ -
trunk/psLib/src/sys/psError.h
r11694 r14452 12 12 * @author Joshua Hoblitt, University of Hawaii 13 13 * 14 * @version $Revision: 1.3 5$ $Name: not supported by cvs2svn $15 * @date $Date: 2007-0 2-08 01:59:28$14 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2007-08-09 01:40:07 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 28 28 #include<stdarg.h> 29 29 30 #include "psType.h" 30 31 #include "psErrorCodes.h" 31 32 … … 101 102 const char* format, ///< printf-style format of header line 102 103 ... ///< any parameters required in format 103 #ifdef __GNUC__ 104 ) __attribute__((format(printf, 2, 3))); 105 #else // ifdef __GNUC__ 106 ); 107 #endif // ifdef __GNUC__ 108 104 ) PS_ATTR_FORMAT(printf, 2, 3); 109 105 110 106 #ifndef SWIG … … 151 147 const char* format, ///< printf-style format of header line 152 148 ... ///< any parameters required in format 153 #ifdef __GNUC__ 154 ) __attribute__((format(printf, 6, 7))); 155 #else // ifdef __GNUC__ 156 ); 157 #endif // ifdef __GNUC__ 149 ) PS_ATTR_FORMAT(printf, 6, 7); 158 150 #ifndef SWIG 159 151 #define psError(code,new,...) \ … … 182 174 const char* format, ///< printf-style format of header line 183 175 ... ///< any parameters required in format 184 #ifdef __GNUC__ 185 ) __attribute__((format(printf, 4, 5))); 186 #else // ifdef __GNUC__ 187 ); 188 #endif // ifdef __GNUC__ 176 ) PS_ATTR_FORMAT(printf, 4, 5); 189 177 #ifndef SWIG 190 178 #define psWarning(...) \ … … 204 192 psErrorCode code, ///< Error class code 205 193 const char* msg ///< Error message 206 ) ;194 ) PS_ATTR_MALLOC; 207 195 208 196 /// @} -
trunk/psLib/src/sys/psLine.h
r11694 r14452 9 9 * @author David Robbins, MHPCC 10 10 * 11 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 2-08 01:59:28$11 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-08-09 01:40:07 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 37 37 psLine *psLineAlloc( 38 38 long Nline ///< length of line object to allocate 39 ) ;39 ) PS_ATTR_MALLOC; 40 40 41 41 … … 74 74 const char *format, ///< printf-style format of line 75 75 ... ///< any parameters required in format 76 #ifdef __GNUC__ 77 ) __attribute__((format(printf, 2, 3))); 78 #else // ifdef __GNUC__ 79 ); 80 #endif // ifdef __GNUC__ 76 ) PS_ATTR_FORMAT(printf, 2, 3); 81 77 82 78 -
trunk/psLib/src/sys/psLogMsg.h
r11694 r14452 11 11 * @author Joshua Hoblitt, University of Hawaii 12 12 * 13 * @version $Revision: 1. 39$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-0 2-08 01:59:28$13 * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-08-09 01:40:07 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 120 120 const char *format, ///< printf-style format command 121 121 ... 122 #ifdef __GNUC__ 123 ) __attribute__((format(printf, 3, 4))); 124 #else // ifdef __GNUC__ 125 ); 126 #endif // ifdef __GNUC__ 122 ) PS_ATTR_FORMAT(printf, 3, 4); 127 123 128 124 -
trunk/psLib/src/sys/psString.h
r12885 r14452 11 11 * @author Joshua Hoblitt, University of Hawaii 12 12 * 13 * @version $Revision: 1.4 1$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-0 4-18 19:37:08$13 * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-08-09 01:40:07 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 25 25 #include <sys/types.h> 26 26 #include <stdarg.h> 27 27 28 #include "psType.h" 28 29 #include "psList.h" … … 32 33 33 34 /** This macro returns a (static buffer containing) "file:line" */ 35 const char *p_psFileLine(const char *file, int line) 34 36 #ifdef __GNUC__ 35 const char *p_psFileLine(const char *file, int line) __attribute__((deprecated)); 36 #else // ifdef __GNUC__ 37 const char *p_psFileLine(const char *file, int line); 37 __attribute__((deprecated)) 38 38 #endif // ifdef __GNUC__ 39 ; 39 40 #define PS_FILE_LINE p_psFileLine(__FILE__,__LINE__) 40 41 … … 54 55 const char *func, ///< Function name of caller 55 56 size_t nChar ///< Size of psString to allocate. 56 ) ;57 ) PS_ATTR_MALLOC; 57 58 #define psStringAlloc(nChar) \ 58 59 p_psStringAlloc(__FILE__, __LINE__, __func__, nChar) … … 147 148 const char *format, ///< format to append 148 149 ... ///< format arguments 149 #ifdef __GNUC__ 150 ) __attribute__((format(printf, 5, 6))); 151 #else // ifdef __GNUC__ 152 ); 153 #endif // ifdef __GNUC__ 150 ) PS_ATTR_FORMAT(printf, 5, 6); 154 151 #define psStringAppend(dest, ...) \ 155 152 p_psStringAppend(__FILE__, __LINE__, __func__, dest, __VA_ARGS__) … … 205 202 const char *format, ///< format to append 206 203 ... ///< format arguments 207 #ifdef __GNUC__ 208 ) __attribute__((format(printf, 5, 6))); 209 # else // ifdef __GNUC__ 210 ); 211 #endif // ifdef __GNUC__ 204 ) PS_ATTR_FORMAT(printf, 5, 6); 212 205 #define psStringPrepend(dest, ...) \ 213 206 p_psStringPrepend(__FILE__, __LINE__, __func__, dest, __VA_ARGS__) -
trunk/psLib/src/sys/psTrace.h
r12494 r14452 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.5 8$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 3-19 22:26:22$11 * @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-08-09 01:40:07 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 100 100 const char *format, ///< printf-style format command 101 101 ... ///< trace message arguments 102 #ifdef __GNUC__ 103 ) __attribute__((format(printf, 6, 7))); 104 #else // ifdef __GNUC__ 105 ); 106 #endif // ifdef __GNUC__ 102 ) PS_ATTR_FORMAT(printf, 6, 7); 107 103 #ifndef SWIG 108 104 #define psTrace(facil, level, ...) \ -
trunk/psLib/src/sys/psType.h
r12439 r14452 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 59$ $Name: not supported by cvs2svn $13 * @date $Date: 2007-0 3-14 04:08:13$12 * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2007-08-09 01:40:07 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 243 243 #define PSELEMTYPE_SIZEOF(x) (x & 0xFF) 244 244 245 #ifdef __GNUC__ 246 #define PS_ATTR_MALLOC __attribute__((__malloc__)) 247 #else // __GNUC__ 248 #define PS_ATTR_MALLOC 249 #endif // __GNUC__ 250 251 #ifdef __GNUC__ 252 #define PS_ATTR_NORETURN __attribute__((noreturn)) 253 #else // __GNUC__ 254 #define PS_ATTR_NORETURN 255 #endif // __GNUC__ 256 257 #ifdef __GNUC__ 258 #define PS_ATTR_FORMAT(style, start, end) __attribute__((format(style, start, end))) 259 #else // __GNUC__ 260 #define PS_ATTR_FORMAT(style, start, end) 261 #endif // __GNUC__ 262 245 263 /** Dimensions of a data type. 246 264 * -
trunk/psLib/src/types/psArray.h
r12303 r14452 10 10 * @author Joshua Hoblitt, University of Hawaii 11 11 * 12 * @version $Revision: 1.4 8$ $Name: not supported by cvs2svn $13 * @date $Date: 2007-0 3-08 02:13:31$12 * @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2007-08-09 01:40:08 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 79 79 const char *func, ///< Function name of caller 80 80 long nalloc ///< Total number of elements to make available. 81 ) ;81 ) PS_ATTR_MALLOC; 82 82 #define psArrayAlloc(nalloc) \ 83 83 p_psArrayAlloc(__FILE__, __LINE__, __func__, nalloc) -
trunk/psLib/src/types/psBitSet.h
r11759 r14452 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.3 0$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-0 2-13 03:01:24$13 * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-08-09 01:40:08 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 76 76 const char *func, ///< Function name of caller 77 77 long nalloc ///< Number of bits in psBitSet array 78 ) ;78 ) PS_ATTR_MALLOC; 79 79 #define psBitSetAlloc(nalloc) \ 80 80 p_psBitSetAlloc(__FILE__, __LINE__, __func__, nalloc) -
trunk/psLib/src/types/psHash.h
r12303 r14452 11 11 * @author GLG, MHPCC 12 12 * 13 * @version $Revision: 1.2 3$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-0 3-08 02:13:31$13 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-08-09 01:40:08 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 69 69 const char *func, ///< Function name of caller 70 70 long nalloc ///< The number of buckets to allocate. 71 ) ;71 ) PS_ATTR_MALLOC; 72 72 #define psHashAlloc(nalloc) \ 73 73 p_psHashAlloc(__FILE__, __LINE__, __func__, nalloc) -
trunk/psLib/src/types/psList.h
r12309 r14452 5 5 * @author Robert Daniel DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.4 5$ $Name: not supported by cvs2svn $8 * @date $Date: 2007-0 3-08 03:59:12$7 * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2007-08-09 01:40:08 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 103 103 const char *func, ///< Function name of caller 104 104 psPtr data ///< initial data item; may be NULL if an empty psList is desired 105 ) ;105 ) PS_ATTR_MALLOC; 106 106 #define psListAlloc(data) \ 107 107 p_psListAlloc(__FILE__, __LINE__, __func__, data) … … 129 129 ///< This can be a numeric index, PS_LIST_HEAD, or PS_LIST_TAIL. 130 130 bool mutable ///< Is it permissible to modify list? 131 ) ;131 ) PS_ATTR_MALLOC; 132 132 #define psListIteratorAlloc(list, location, mutable) \ 133 133 p_psListIteratorAlloc(__FILE__, __LINE__, __func__, list, location, mutable) -
trunk/psLib/src/types/psLookupTable.h
r12329 r14452 6 6 * @author Ross Harman, MHPCC 7 7 * 8 * @version $Revision: 1.2 0$ $Name: not supported by cvs2svn $9 * @date $Date: 2007-0 3-08 22:08:26$8 * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2007-08-09 01:40:08 $ 10 10 * 11 11 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 105 105 const char *format, ///< scanf-like format string 106 106 long indexCol ///< Column of the index vector (starting at zero) 107 ) ;107 ) PS_ATTR_MALLOC; 108 108 #define psLookupTableAlloc(filename, format, indexCol) \ 109 109 p_psLookupTableAlloc(__FILE__, __LINE__, __func__, filename, format, indexCol) -
trunk/psLib/src/types/psMetadata.h
r14008 r14452 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.10 2$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 7-04 01:36:14$11 * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-08-09 01:40:08 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 161 161 const char *comment, ///< Comment for metadata item. 162 162 ... ///< Arguments for name formatting and metadata item data. 163 ) ;163 ) PS_ATTR_MALLOC; 164 164 #define psMetadataItemAlloc(name, type, ...) \ 165 165 p_psMetadataItemAlloc(__FILE__, __LINE__, __func__, name, type, __VA_ARGS__) … … 417 417 unsigned int lineno, ///< Line number of caller 418 418 const char *func ///< Function name of caller 419 ) ;419 ) PS_ATTR_MALLOC; 420 420 #define psMetadataAlloc() \ 421 421 p_psMetadataAlloc(__FILE__, __LINE__, __func__) … … 1167 1167 ///< A regular expression for subsetting the psMetadata. If NULL, no 1168 1168 ///< subsetting is performed. 1169 ) ;1169 ) PS_ATTR_MALLOC; 1170 1170 #define psMetadataIteratorAlloc(md, location, regex) \ 1171 1171 p_psMetadataIteratorAlloc(__FILE__, __LINE__, __func__, md, location, regex) -
trunk/psLib/src/types/psPixels.h
r12330 r14452 6 6 * @author Robert DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1.2 7$ $Name: not supported by cvs2svn $9 * @date $Date: 2007-0 3-08 22:12:56$8 * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2007-08-09 01:40:08 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 74 74 const char *func, ///< Function name of caller 75 75 long nalloc ///< the size of the coordinate vectors 76 ) ;76 ) PS_ATTR_MALLOC; 77 77 #define psPixelsAlloc(nalloc) \ 78 78 p_psPixelsAlloc(__FILE__, __LINE__, __func__, nalloc)
Note:
See TracChangeset
for help on using the changeset viewer.
