Changeset 2204 for trunk/psLib/src/astronomy/psMetadataIO.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/src/astronomy/psMetadataIO.c (modified) (12 diffs)

trunk/psLib/src/astronomy/psMetadataIO.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-08 00:43:12 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:30 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -104 +104 @@
 /** Determines if a line is blank (whitespace only) or a commentline. It returns true if so. The input string
  *  must be null terminated. */
-bool ignoreLine(char *inString)
+psBool ignoreLine(char *inString)
 {
     while(*inString!='\0' && *inString!='#') {
@@ -119 +119 @@
 /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null
  *  terminated copy of the original input string. */
-char *cleanString(char *inString, int sLen)
+char *cleanString(char *inString, psS32 sLen)
 {
     char *ptrB = NULL;
@@ -149 +149 @@
 
 /** Count repeat occurances of a single character within a line. The input string must be null terminated. */
-int repeatedChars(char *inString, char ch)
-{
-    int count = 0;
+psS32 repeatedChars(char *inString, char ch)
+{
+    psS32 count = 0;
 
 
@@ -166 +166 @@
 /** Returns cleaned token based on delimiter, but not including delimiter. Also changes the pointer location
  * the beginning of the string. Tokens are newly allocated null terminated strings. */
-char* getToken(char **inString, char *delimiter, int *status)
+char* getToken(char **inString, char *delimiter, psS32 *status)
 {
     char *cleanToken = NULL;
-    int sLen = 0;
+    psS32 sLen = 0;
 
 
@@ -195 +195 @@
 /** Returns single parsed value as a double precision number. The input string must be cleaned and null
  * terminated. */
-double parseValue(char *inString, int *status)
+double parseValue(char *inString, psS32 *status)
 {
     char *end = NULL;
@@ -212 +212 @@
 
 /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */
-bool parseBool(char *inString, int *status)
-{
-    bool value = false;
+psBool parseBool(char *inString, psS32 *status)
+{
+    psBool value = false;
 
 
@@ -229 +229 @@
 
 /** Returns parsed vector filled with with data. The input string must be null terminated. */
-psVector* parseVector(char *inString, psElemType elemType, int *status)
+psVector* parseVector(char *inString, psElemType elemType, psS32 *status)
 {
     char *end = NULL;
     char *saveValue = NULL;
-    int i = 0;
-    int numValues = 0;
+    psS32 i = 0;
+    psS32 numValues = 0;
     double value = 0.0;
     psVector *vec = NULL;
@@ -341 +341 @@
 
 
-psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, int extNum, char *fileName)
-{
-    bool tempBool;
-    bool success;
+psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, psS32 extNum, char *fileName)
+{
+    psBool tempBool;
+    psBool success;
     char keyType;
     char keyName[FITS_LINE_SIZE];
@@ -350 +350 @@
     char keyComment[FITS_LINE_SIZE];
     char fitsErr[MAX_STRING_LENGTH];
-    int i;
-    int hduType = 0;
-    int status = 0;
-    int numKeys = 0;
-    int keyNum = 0;
+    psS32 i;
+    psS32 hduType = 0;
+    psS32 status = 0;
+    psS32 numKeys = 0;
+    psS32 keyNum = 0;
     psMetadataType metadataItemType;
     fitsfile *fd = NULL;
@@ -449 +449 @@
 
 
-int psMetadataParseConfig(psMetadata** md, char *fileName, bool overwrite)
-{
-    bool tempBool;
+psS32 psMetadataParseConfig(psMetadata** md, char *fileName, psBool overwrite)
+{
+    psBool tempBool;
     char *line = NULL;
     char *strName = NULL;
@@ -458 +458 @@
     char *strComment = NULL;
     char *linePtr = NULL;
-    int status = 0;
-    int lineCount = 0;
-    int failedLines = 0;
+    psS32 status = 0;
+    psS32 lineCount = 0;
+    psS32 failedLines = 0;
     psF64 tempDbl = 0.0;
     psS32 tempInt = 0.0;