Changeset 11668
- Timestamp:
- Feb 6, 2007, 11:36:09 AM (19 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 30 edited
-
astro/psCoord.c (modified) (2 diffs)
-
astro/psCoord.h (modified) (2 diffs)
-
astro/psTime.c (modified) (2 diffs)
-
astro/psTime.h (modified) (3 diffs)
-
db/psDB.c (modified) (3 diffs)
-
fft/psImageFFT.c (modified) (2 diffs)
-
fft/psVectorFFT.c (modified) (2 diffs)
-
fits/psFitsHeader.c (modified) (2 diffs)
-
math/psMinimizeLMM.c (modified) (5 diffs)
-
math/psMinimizeLMM.h (modified) (2 diffs)
-
math/psMinimizePowell.c (modified) (3 diffs)
-
mathtypes/psImage.c (modified) (4 diffs)
-
mathtypes/psVector.c (modified) (2 diffs)
-
mathtypes/psVector.h (modified) (2 diffs)
-
sys/psError.h (modified) (2 diffs)
-
sys/psErrorCodes.c.in (modified) (2 diffs)
-
sys/psErrorCodes.h.in (modified) (2 diffs)
-
sys/psLogMsg.c (modified) (3 diffs)
-
sys/psTrace.c (modified) (3 diffs)
-
sys/psType.h (modified) (3 diffs)
-
types/psArray.h (modified) (2 diffs)
-
types/psHash.c (modified) (4 diffs)
-
types/psList.c (modified) (3 diffs)
-
types/psLookupTable.c (modified) (2 diffs)
-
types/psMetadata.c (modified) (5 diffs)
-
types/psMetadata.h (modified) (4 diffs)
-
types/psMetadataConfig.c (modified) (11 diffs)
-
types/psMetadataItemCompare.c (modified) (1 diff)
-
types/psMetadataItemParse.c (modified) (1 diff)
-
types/psMetadataItemParse.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astro/psCoord.c
r11618 r11668 10 10 * @author GLG, MHPCC 11 11 * 12 * @version $Revision: 1.13 2$ $Name: not supported by cvs2svn $13 * @date $Date: 2007-02-0 3 06:01:42$12 * @version $Revision: 1.133 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2007-02-06 21:36:09 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 151 151 Why isn't this called p_psIsPlaneTransformLinear()? 152 152 *****************************************************************************/ 153 psBool p_psIsProjectionLinear(psPlaneTransform *transform)153 bool p_psIsProjectionLinear(psPlaneTransform *transform) 154 154 { 155 155 PS_ASSERT_PTR_NON_NULL(transform, false); -
trunk/psLib/src/astro/psCoord.h
r11248 r11668 8 8 * @author GLG, MHPCC 9 9 * 10 * @version $Revision: 1.5 6$ $Name: not supported by cvs2svn $11 * @date $Date: 2007-0 1-23 22:47:22$10 * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2007-02-06 21:36:09 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 321 321 * the order of the projection 322 322 */ 323 psBool p_psIsProjectionLinear(323 bool p_psIsProjectionLinear( 324 324 psPlaneTransform *transform ///< transform to test for linearity 325 325 ); -
trunk/psLib/src/astro/psTime.c
r10999 r11668 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1.10 8$ $Name: not supported by cvs2svn $13 * @date $Date: 2007-0 1-09 22:38:52$12 * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2007-02-06 21:36:09 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1268 1268 { 1269 1269 psTime* prevUtc = NULL; 1270 psBool returnValue = false;1270 bool returnValue = false; 1271 1271 1272 1272 // Check for valid time -
trunk/psLib/src/astro/psTime.h
r11248 r11668 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.5 4$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-0 1-23 22:47:22$13 * @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-02-06 21:36:09 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 85 85 * @return bool: True for success, false for failure. 86 86 */ 87 psBool p_psTimeInit(87 bool p_psTimeInit( 88 88 const char *fileName ///< File name containing config/data info 89 89 ); … … 103 103 * @return void: void. 104 104 */ 105 psBool p_psTimeFinalize(void);105 bool p_psTimeFinalize(void); 106 106 107 107 /** Frees memory that was allocated by psTime functions. -
trunk/psLib/src/db/psDB.c
r11426 r11668 12 12 * @author Joshua Hoblitt 13 13 * 14 * @version $Revision: 1.13 3$ $Name: not supported by cvs2svn $15 * @date $Date: 2007-0 1-30 05:16:28$14 * @version $Revision: 1.134 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2007-02-06 21:36:09 $ 16 16 * 17 17 * Copyright (C) 2005-2006 Joshua Hoblitt, University of Hawaii … … 1337 1337 case PS_DATA_BOOL: { 1338 1338 // XXX: ASC HACK NOTE (2005/06/03): set extreme bytes to the 1339 // boolean character value. sizeof( psBool)==4 which triggers1339 // boolean character value. sizeof(bool)==4 which triggers 1340 1340 // an endianess issue in the MySQL conversion (reading only 1 1341 1341 // byte), on Macintosh hardware (and maybe others?) … … 2013 2013 break; 2014 2014 default: 2015 psError(PS_ERR_UNKNOWN, true, "NULL psBool can't be compared with any operator other than '=='");2015 psError(PS_ERR_UNKNOWN, true, "NULL bool can't be compared with any operator other than '=='"); 2016 2016 psFree(itemName); 2017 2017 return NULL; -
trunk/psLib/src/fft/psImageFFT.c
r10999 r11668 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1. 19$ $Name: not supported by cvs2svn $8 * @date $Date: 2007-0 1-09 22:38:52$7 * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2007-02-06 21:36:09 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 30 30 #define PS_FFTW_PLAN_RIGOR FFTW_ESTIMATE 31 31 32 static psBool p_fftwWisdomImported = false;32 static bool p_fftwWisdomImported = false; 33 33 34 34 psImage* psImageFFT(psImage* out, const psImage* image, psFFTFlags direction) -
trunk/psLib/src/fft/psVectorFFT.c
r10999 r11668 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.3 5$ $Name: not supported by cvs2svn $8 * @date $Date: 2007-0 1-09 22:38:52$7 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2007-02-06 21:36:09 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 30 30 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE 31 31 32 static psBool p_fftwWisdomImported = false;32 static bool p_fftwWisdomImported = false; 33 33 34 34 psVector* psVectorFFT(psVector* out, const psVector* in, psFFTFlags direction) -
trunk/psLib/src/fits/psFitsHeader.c
r10999 r11668 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.3 0$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 1-09 22:38:52$9 * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-02-06 21:36:09 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 103 103 } 104 104 105 psBool success; // Was the add to the metadata successful?105 bool success; // Was the add to the metadata successful? 106 106 switch (keyType) { 107 107 case 'X': // bit -
trunk/psLib/src/math/psMinimizeLMM.c
r10999 r11668 10 10 * @author EAM, IfA 11 11 * 12 * @version $Revision: 1.2 8$ $Name: not supported by cvs2svn $13 * @date $Date: 2007-0 1-09 22:38:53$12 * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2007-02-06 21:36:09 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 54 54 /*****************************************************************************/ 55 55 56 psBool p_psMinLM_GuessABP(56 bool p_psMinLM_GuessABP( 57 57 psImage *Alpha, 58 58 psVector *Beta, … … 171 171 psVector *Params = psVectorAlloc(params->n, PS_TYPE_F32); 172 172 psVector *dy = NULL; 173 psBool rc = true;173 bool rc = true; 174 174 175 175 // the user provides the error or NULL. we need to convert … … 196 196 } 197 197 198 psBool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, 0.0);198 bool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, 0.0); 199 199 if (rcBool == false) { 200 200 psTrace ("psLib.math", 5, "p_psMinLM_GuessABP() returned FALSE.\n"); … … 334 334 XXX Make an F64 version? 335 335 *****************************************************************************/ 336 psBool psMinimizeLMChi2(336 bool psMinimizeLMChi2( 337 337 psMinimization *min, 338 338 psImage *covar, -
trunk/psLib/src/math/psMinimizeLMM.h
r11248 r11668 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-02-06 21:36:09 $ 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 12 12 */ … … 156 156 157 157 158 psBool p_psMinLM_GuessABP(158 bool p_psMinLM_GuessABP( 159 159 psImage *Alpha, 160 160 psVector *Beta, -
trunk/psLib/src/math/psMinimizePowell.c
r10999 r11668 11 11 * NOTE: XXX: The SDR is silent about data types. F32 is implemented here. 12 12 * 13 * @version $Revision: 1.1 5$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-0 1-09 22:38:53$13 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-02-06 21:36:09 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 120 120 psF32 stepSize = PS_DETERMINE_BRACKET_STEP_SIZE; 121 121 psVector *tmp = NULL; 122 psBool boolLineIsNull = true;122 bool boolLineIsNull = true; 123 123 124 124 psTrace("psLib.math", 4, "---- p_psDetermineBracket() begin ----\n"); … … 254 254 psS32 iter = 0; 255 255 psVector *tmp = psVectorAlloc(params->n, PS_TYPE_F32); 256 psBool boolLineIsNull = true;256 bool boolLineIsNull = true; 257 257 psF32 prevMin = 0.0; 258 258 psS32 countMin = 0; -
trunk/psLib/src/mathtypes/psImage.c
r10999 r11668 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.12 1$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 1-09 22:38:53$11 * @version $Revision: 1.122 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-02-06 21:36:09 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 780 780 ps##TYPE V10 = 0; \ 781 781 ps##TYPE V11 = 0; \ 782 psBool valid00 = false; \783 psBool valid01 = false; \784 psBool valid10 = false; \785 psBool valid11 = false; \782 bool valid00 = false; \ 783 bool valid01 = false; \ 784 bool valid10 = false; \ 785 bool valid11 = false; \ 786 786 \ 787 787 if (floorY >= 0 && floorY <= lastY) { \ … … 821 821 \ 822 822 RETURNTYPE V0 = 0.0; \ 823 psBool valid0 = true; \823 bool valid0 = true; \ 824 824 if (valid00 && valid10) { \ 825 825 V0 = V00*FRACFUNC(1-fracX)+V10*FRACFUNC(fracX); \ … … 833 833 \ 834 834 RETURNTYPE V1 = 0.0; \ 835 psBool valid1 = true; \835 bool valid1 = true; \ 836 836 if (valid01 && valid11) { \ 837 837 V1 = V01*FRACFUNC(1-fracX)+V11*FRACFUNC(fracX); \ -
trunk/psLib/src/mathtypes/psVector.c
r10999 r11668 9 9 * @author Robert DeSonia, MHPCC 10 10 * 11 * @version $Revision: 1.9 0$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 1-09 22:38:53$11 * @version $Revision: 1.91 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-02-06 21:36:09 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 693 693 // This is a little ugly, because psVector doesn't have a boolean type yet. 694 694 int temp = va_arg(argp, int); 695 psBool value = temp;695 bool value = temp; 696 696 if (!value) { 697 memset(vector->data.U8, 0, vector->n * sizeof( psBool));697 memset(vector->data.U8, 0, vector->n * sizeof(bool)); 698 698 } else { 699 699 for (long i = 0; i < vector->n; i++) { -
trunk/psLib/src/mathtypes/psVector.h
r11248 r11668 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.6 1$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 1-23 22:47:23$11 * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-02-06 21:36:09 $ 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 14 14 */ … … 199 199 /** Print a vector to a stream 200 200 * 201 * @return psBool TRUE is successful, otherwise FALSE.201 * @return bool TRUE is successful, otherwise FALSE. 202 202 */ 203 203 bool p_psVectorPrint ( -
trunk/psLib/src/sys/psError.h
r11248 r11668 11 11 * @author Eric Van Alst, MHPCC 12 12 * 13 * @version $Revision: 1.3 2$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-0 1-23 22:47:23$13 * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-02-06 21:36:09 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 134 134 psErrorCode psError( 135 135 psErrorCode code, ///< Error class code 136 psBool new, ///< true if error originates at this location136 bool new, ///< true if error originates at this location 137 137 const char* format, ///< printf-style format of header line 138 138 ... ///< any parameters required in format -
trunk/psLib/src/sys/psErrorCodes.c.in
r11265 r11668 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 1-24 22:14:48$9 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-02-06 21:36:09 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 145 145 } 146 146 147 psBool p_psErrorUnregister(psErrorCode code)147 bool p_psErrorUnregister(psErrorCode code) 148 148 { 149 149 // Check input argument is non-negative -
trunk/psLib/src/sys/psErrorCodes.h.in
r11248 r11668 6 6 * @author Robert DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $9 * @date $Date: 2007-0 1-23 22:47:23$8 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2007-02-06 21:36:09 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 75 75 /** Clears error codes registered via psErrorRegister. 76 76 * 77 * @return psBool TRUE if given errorcode was removed, otherwise FALSE.77 * @return bool TRUE if given errorcode was removed, otherwise FALSE. 78 78 */ 79 psBool p_psErrorUnregister(79 bool p_psErrorUnregister( 80 80 psErrorCode code ///< the error code to find and remove 81 81 ); -
trunk/psLib/src/sys/psLogMsg.c
r11617 r11668 11 11 * @author GLG, MHPCC 12 12 * 13 * @version $Revision: 1.6 5$ $Name: not supported by cvs2svn $14 * @date $Date: 2007-02-0 3 05:54:08$13 * @version $Revision: 1.66 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2007-02-06 21:36:09 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 47 47 static int logFD = STDERR_FILENO; // Log file descriptor 48 48 static psS32 globalLogLevel = PS_LOG_INFO; // log all messages at this or above 49 static psBool logTime = true; // Flag to include time info50 static psBool logHost = true; // Flag to include host info51 static psBool logLevel = true; // Flag to include level info52 static psBool logName = true; // Flag to include name info53 static psBool logMsg = true; // Flag to include message info49 static bool logTime = true; // Flag to include time info 50 static bool logHost = true; // Flag to include host info 51 static bool logLevel = true; // Flag to include level info 52 static bool logName = true; // Flag to include name info 53 static bool logMsg = true; // Flag to include message info 54 54 55 55 /***************************************************************************** … … 86 86 dest (psS32): the new log destination 87 87 Return: 88 An psBool: TRUE if successful.88 An bool: TRUE if successful. 89 89 *****************************************************************************/ 90 90 bool psLogSetDestination(int fd) -
trunk/psLib/src/sys/psTrace.c
r11617 r11668 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.8 3$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-02-0 3 05:54:08$11 * @version $Revision: 1.84 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-02-06 21:36:09 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 67 67 68 68 static p_psComponent* cRoot = NULL; // The root of the trace component 69 static psBool traceTime = false; // Flag to include time info70 static psBool traceHost = false; // Flag to include host info71 static psBool traceLevel = false; // Flag to include level info72 static psBool traceName = false; // Flag to include name info73 static psBool traceMsg = true; // Flag to include message info69 static bool traceTime = false; // Flag to include time info 70 static bool traceHost = false; // Flag to include host info 71 static bool traceLevel = false; // Flag to include level info 72 static bool traceName = false; // Flag to include name info 73 static bool traceMsg = true; // Flag to include message info 74 74 static int traceFD = STDOUT_FILENO; // default value 75 75 … … 182 182 componentAdd(): Adds the component named "addNodeName" to the root tree. 183 183 *****************************************************************************/ 184 static psBool componentAdd(const char *addNodeName, psS32 level)184 static bool componentAdd(const char *addNodeName, psS32 level) 185 185 { 186 186 assert(addNodeName); -
trunk/psLib/src/sys/psType.h
r11265 r11668 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1.5 4$ $Name: not supported by cvs2svn $13 * @date $Date: 2007-0 1-24 22:14:48$12 * @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2007-02-06 21:36:09 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 73 73 typedef char* psString; ///< string value 74 74 typedef void* psPtr; ///< void pointer 75 // XXX psBool can't be removed until all macros that 'generate' this type are 76 // fixed -JH 77 // #ifdef __GNUC__ 78 // typedef bool psBool __attribute__ ((deprecated)); ///< boolean value 79 //#else // ifdef __GNUC__ 75 80 typedef bool psBool; ///< boolean value 81 // #endif // fdef __GNUC__ 82 typedef bool psBOOL; ///< allow psBOOL to be used instead of psBool (for macros) 76 83 77 84 /** Enumeration of data types for function elements. … … 150 157 151 158 typedef psU8 psMaskType; ///< the C datatype for a mask image 152 typedef psBool psBOOL; ///< allow psBOOL to be used instead of psBool (for macros)153 159 154 160 #define PS_MIN_S8 INT8_MIN /**< minimum valid psS8 value */ -
trunk/psLib/src/types/psArray.h
r11248 r11668 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.4 5$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 1-23 22:47:23$11 * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-02-06 21:36:09 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 166 166 * element is freed. 167 167 * 168 * @return psBool TRUE if the element was set successfully, otherwise FALSE168 * @return bool TRUE if the element was set successfully, otherwise FALSE 169 169 */ 170 170 bool psArraySet( -
trunk/psLib/src/types/psHash.c
r10999 r11668 12 12 * @author GLG, MHPCC 13 13 * 14 * @version $Revision: 1.3 6$ $Name: not supported by cvs2svn $15 * @date $Date: 2007-0 1-09 22:38:53$14 * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2007-02-06 21:36:09 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 38 38 static psHashBucket* hashBucketAlloc(const char *key, psPtr data, psHashBucket* next); 39 39 static void hashBucketFree(psHashBucket* bucket); 40 static psPtr doHashWork(psHash* table, const char *key, psPtr data, psBool remove40 static psPtr doHashWork(psHash* table, const char *key, psPtr data, bool remove 41 41 ); 42 42 static void hashFree(psHash* table); … … 227 227 const char *key, 228 228 psPtr data, 229 psBool remove229 bool remove 230 230 ) 231 231 { … … 407 407 408 408 psPtr data = NULL; 409 psBool retVal = false;409 bool retVal = false; 410 410 411 411 data = doHashWork(hash, key, NULL, true); -
trunk/psLib/src/types/psList.c
r10999 r11668 6 6 * @author Robert Daniel DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1. 59$ $Name: not supported by cvs2svn $9 * @date $Date: 2007-0 1-09 22:38:53$8 * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2007-02-06 21:36:09 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 35 35 static void listFree(psList* list); 36 36 static void listIteratorFree(psListIterator* iter); 37 static psBool listIteratorRemove(psListIterator* iterator);37 static bool listIteratorRemove(psListIterator* iterator); 38 38 39 39 static void listFree(psList* list) … … 80 80 } 81 81 82 static psBool listIteratorRemove(psListIterator* iterator)82 static bool listIteratorRemove(psListIterator* iterator) 83 83 { 84 84 if (iterator == NULL || iterator->cursor == NULL) { -
trunk/psLib/src/types/psLookupTable.c
r10999 r11668 7 7 * @author Ross Harman, MHPCC 8 8 * 9 * @version $Revision: 1.4 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2007-0 1-09 22:38:53$9 * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2007-02-06 21:36:09 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii … … 613 613 { 614 614 psLookupTable* outputTable = NULL; 615 psBool sortNeeded = false;615 bool sortNeeded = false; 616 616 psF64 validTo = 0; 617 617 psF64 validFrom = 0; -
trunk/psLib/src/types/psMetadata.c
r10999 r11668 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.14 8$ $Name: not supported by cvs2svn $15 * @date $Date: 2007-0 1-09 22:38:53$14 * @version $Revision: 1.149 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2007-02-06 21:36:09 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 185 185 METADATAITEM_ALLOC_TYPE(U32,psU32,PS_DATA_U32) 186 186 METADATAITEM_ALLOC_TYPE(U64,psU64,PS_DATA_U64) 187 METADATAITEM_ALLOC_TYPE(Bool, psBool,PS_DATA_BOOL)187 METADATAITEM_ALLOC_TYPE(Bool,bool,PS_DATA_BOOL) 188 188 189 189 psMetadataItem* psMetadataItemAllocPtr(const char *name, … … 233 233 switch(metadataItem->type) { 234 234 case PS_DATA_BOOL: 235 metadataItem->data.B = ( psBool)va_arg(argPtr, psS32);235 metadataItem->data.B = (bool)va_arg(argPtr, psS32); 236 236 break; 237 237 case PS_DATA_S8: … … 647 647 648 648 va_start(argPtr, comment); 649 psBool result = psMetadataAddV(md,location,name,format,comment,argPtr);649 bool result = psMetadataAddV(md,location,name,format,comment,argPtr); 650 650 va_end(argPtr); 651 651 … … 683 683 } 684 684 685 METADATA_ADD_TYPE(Bool, psBool,PS_DATA_BOOL)685 METADATA_ADD_TYPE(Bool,bool,PS_DATA_BOOL) 686 686 METADATA_ADD_TYPE(S8,psS8,PS_DATA_S8) 687 687 METADATA_ADD_TYPE(S16,psS16,PS_DATA_S16) -
trunk/psLib/src/types/psMetadata.h
r11248 r11668 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.9 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2007-0 1-23 22:47:23$11 * @version $Revision: 1.95 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2007-02-06 21:36:09 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 104 104 psDataType type; ///< Type of metadata item. 105 105 union { 106 psBool B; ///< boolean data106 bool B; ///< boolean data 107 107 psS8 S8; ///< Signed 8-bit integer data. 108 108 psS16 S16; ///< Signed 16-bit integer data. … … 301 301 ); 302 302 303 /** Create a metadata item with specified psBool data.303 /** Create a metadata item with specified bool data. 304 304 * 305 305 * Returns a fill psMetadataItem ready for insertion into the psMetadata … … 452 452 #endif // #ifndef SWIG 453 453 454 /** Add a psBool value to metadata collection.454 /** Add a bool value to metadata collection. 455 455 * 456 456 * @return bool: True for success, False for failure. -
trunk/psLib/src/types/psMetadataConfig.c
r11152 r11668 10 10 * @author Eric Van Alst, MHPCC 11 11 * 12 * @version $Revision: 1.12 7$ $Name: not supported by cvs2svn $13 * @date $Date: 2007-0 1-19 04:29:11$12 * @version $Revision: 1.128 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2007-02-06 21:36:09 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 67 67 static psMetadata* setMetadataItem(psMetadata* template, char* linePtr) 68 68 ; 69 static psBool parseLine(psArray* levelArray, char* linePtr,70 psS32 lineCount, psBool overwrite);71 static psBool parseMetadataItem(char* keyName, psArray* levelArray,72 69 static bool parseLine(psArray* levelArray, char* linePtr, 70 psS32 lineCount, bool overwrite); 71 static bool parseMetadataItem(char* keyName, psArray* levelArray, 72 char* linePtr, psS32 lineCount, psMetadataFlags flags); 73 73 static psString formatMetadataItem(psMetadataItem *item); 74 74 static psArray *p_psMetadataKeyArray(psMetadata *md); … … 125 125 // Determines if a line is blank (whitespace only) or a commentline. It returns true if so. The input string 126 126 // must be null terminated. 127 static psBool ignoreLine(char *inString)127 static bool ignoreLine(char *inString) 128 128 { 129 129 while(*inString!='\0' && *inString!='#') { … … 142 142 static char *cleanString(char *inString, 143 143 psS32 sLen, 144 psBool ignoreComment)144 bool ignoreComment) 145 145 { 146 146 char *ptrB = NULL; … … 208 208 char *delimiter, 209 209 psS32 *status, 210 psBool ignoreComment)210 bool ignoreComment) 211 211 { 212 212 char *cleanToken = NULL; … … 295 295 296 296 /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */ 297 static psBool parseBool(char *inString,298 297 static bool parseBool(char *inString, 298 psS32 *status) 299 299 { 300 300 // if inString is NULL return flalse, status = 0 … … 446 446 { 447 447 psDataType type; 448 psBool success = true;448 bool success = true; 449 449 450 450 PS_ASSERT_PTR_NON_NULL(fd, false); … … 669 669 } 670 670 671 psBool parseMetadataItem(char* keyName,672 673 674 675 676 { 677 psBool returnValue = true;678 psBool addStatus = false;671 bool parseMetadataItem(char* keyName, 672 psArray* levelArray, 673 char* linePtr, 674 psS32 lineCount, 675 psMetadataFlags flags) 676 { 677 bool returnValue = true; 678 bool addStatus = false; 679 679 psDataType mdType = PS_DATA_UNKNOWN; 680 680 psElemType vectorType = PS_TYPE_S8; … … 685 685 psMetadata* md = NULL; 686 686 psF64 tempDbl = 0.0; 687 psBool tempBool = false;687 bool tempBool = false; 688 688 psS64 tempInt = 0; 689 689 psU64 tempUint = 0; … … 691 691 char* tempStr = NULL; 692 692 psArray* nonUniqueKeys = NULL; 693 psBool typeFound = false;693 bool typeFound = false; 694 694 psArray* typeArray = NULL; 695 695 psArray* templateArray = NULL; … … 1083 1083 } 1084 1084 1085 psBool parseLine(psArray* levelArray,1086 1087 1088 psBool overwrite)1085 bool parseLine(psArray* levelArray, 1086 char* linePtr, 1087 psS32 lineCount, 1088 bool overwrite) 1089 1089 { 1090 1090 psMetadataFlags flags = PS_META_DEFAULT; -
trunk/psLib/src/types/psMetadataItemCompare.c
r10999 r11668 57 57 58 58 switch (template->type) { 59 TEMPLATE_CASE(BOOL, B, psBool)59 TEMPLATE_CASE(BOOL, B, bool) 60 60 ; 61 61 TEMPLATE_CASE(U8, U8, psU8 ); -
trunk/psLib/src/types/psMetadataItemParse.c
r10999 r11668 38 38 } 39 39 40 psBool psMetadataItemParseBool(const psMetadataItem *item41 40 bool psMetadataItemParseBool(const psMetadataItem *item 41 ) 42 42 { 43 43 PS_ASSERT_PTR_NON_NULL(item, false); 44 44 45 45 switch (item->type) { 46 PS_METADATA_ITEM_PARSE_NUMBER(F32, B ool);47 PS_METADATA_ITEM_PARSE_NUMBER(F64, B ool);48 PS_METADATA_ITEM_PARSE_NUMBER(S8, B ool);49 PS_METADATA_ITEM_PARSE_NUMBER(S16, B ool);50 PS_METADATA_ITEM_PARSE_NUMBER(S32, B ool);51 PS_METADATA_ITEM_PARSE_NUMBER(U8, B ool);52 PS_METADATA_ITEM_PARSE_NUMBER(U16, B ool);53 PS_METADATA_ITEM_PARSE_NUMBER(U32, B ool);46 PS_METADATA_ITEM_PARSE_NUMBER(F32, BOOL); 47 PS_METADATA_ITEM_PARSE_NUMBER(F64, BOOL); 48 PS_METADATA_ITEM_PARSE_NUMBER(S8, BOOL); 49 PS_METADATA_ITEM_PARSE_NUMBER(S16, BOOL); 50 PS_METADATA_ITEM_PARSE_NUMBER(S32, BOOL); 51 PS_METADATA_ITEM_PARSE_NUMBER(U8, BOOL); 52 PS_METADATA_ITEM_PARSE_NUMBER(U16, BOOL); 53 PS_METADATA_ITEM_PARSE_NUMBER(U32, BOOL); 54 54 case PS_DATA_BOOL: 55 55 return item->data.B; -
trunk/psLib/src/types/psMetadataItemParse.h
r11248 r11668 5 5 * @author EAM, PAP, JH, RHL, 6 6 * 7 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $8 * @date $Date: 2007-0 1-23 22:47:23$7 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2007-02-06 21:36:09 $ 9 9 * 10 10 * Copyright 2004-2005 IfA, University of Hawaii … … 21 21 22 22 // Parse a psMetadataItem as a particular type 23 psBool psMetadataItemParseBool(const psMetadataItem *item);23 bool psMetadataItemParseBool(const psMetadataItem *item); 24 24 psF32 psMetadataItemParseF32(const psMetadataItem *item); 25 25 psF64 psMetadataItemParseF64(const psMetadataItem *item);
Note:
See TracChangeset
for help on using the changeset viewer.
