Changeset 2004

Timestamp:

Oct 7, 2004, 9:31:59 AM (22 years ago)

Author:

harman

Message:

Fixed minor casting problem

Location:

trunk/psLib/src

Files:

• astronomy/psMetadata.c (modified) (2 diffs)
• astronomy/psMetadataIO.c (modified) (5 diffs)
• collections/psMetadata.c (modified) (2 diffs)
• collections/psMetadataIO.c (modified) (5 diffs)
• types/psMetadata.c (modified) (2 diffs)
• types/psMetadataConfig.c (modified) (5 diffs)
• xml/psXML.c (modified) (5 diffs)

trunk/psLib/src/astronomy/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-06 23:27:27 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:31:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -159 +159 @@
         break;
     case PS_META_S32:
-        metadataItem->data.S32 = va_arg(argPtr, psS32);
+        metadataItem->data.S32 = (psS32)va_arg(argPtr, psF64);
         break;
     case PS_META_F32:

trunk/psLib/src/astronomy/psMetadataIO.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-07 02:16:36 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:31:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -462 +462 @@
     int lineCount = 0;
     int failedLines = 0;
-    psF64 tempValue = 0.0;
+    psF64 tempDbl = 0.0;
     psMetadataItem *metadataItem = NULL;
     psVector *tempVec = NULL;
@@ -508 +508 @@
             } else if(repeatedChars(linePtr, '*') > 1) {
                 failedLines++;
-                psError(__func__, "More than one @ charecter not allowed. Line %d: %s", lineCount, line);
+                psError(__func__, "More than one * charecter not allowed. Line %d: %s", lineCount, line);
                 continue;
             } else if(repeatedChars(linePtr, '~') > 0) {
@@ -515 +515 @@
                 continue;
             }
-
 
             // Get metadata item name
@@ -616 +615 @@
             case PS_META_F32:
             case PS_META_F64:
-                tempValue = parseValue(strValue, &status);
+                tempDbl = parseValue(strValue, &status);
                 if(!status) {
-                    psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempValue);
+                    psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempDbl);
                 } else {
                     status = 0;

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-06 23:27:27 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:31:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -159 +159 @@
         break;
     case PS_META_S32:
-        metadataItem->data.S32 = va_arg(argPtr, psS32);
+        metadataItem->data.S32 = (psS32)va_arg(argPtr, psF64);
         break;
     case PS_META_F32:

trunk/psLib/src/collections/psMetadataIO.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-07 02:16:36 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:31:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -462 +462 @@
     int lineCount = 0;
     int failedLines = 0;
-    psF64 tempValue = 0.0;
+    psF64 tempDbl = 0.0;
     psMetadataItem *metadataItem = NULL;
     psVector *tempVec = NULL;
@@ -508 +508 @@
             } else if(repeatedChars(linePtr, '*') > 1) {
                 failedLines++;
-                psError(__func__, "More than one @ charecter not allowed. Line %d: %s", lineCount, line);
+                psError(__func__, "More than one * charecter not allowed. Line %d: %s", lineCount, line);
                 continue;
             } else if(repeatedChars(linePtr, '~') > 0) {
@@ -515 +515 @@
                 continue;
             }
-
 
             // Get metadata item name
@@ -616 +615 @@
             case PS_META_F32:
             case PS_META_F64:
-                tempValue = parseValue(strValue, &status);
+                tempDbl = parseValue(strValue, &status);
                 if(!status) {
-                    psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempValue);
+                    psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempDbl);
                 } else {
                     status = 0;

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-06 23:27:27 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:31:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -159 +159 @@
         break;
     case PS_META_S32:
-        metadataItem->data.S32 = va_arg(argPtr, psS32);
+        metadataItem->data.S32 = (psS32)va_arg(argPtr, psF64);
         break;
     case PS_META_F32:

trunk/psLib/src/types/psMetadataConfig.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-07 02:16:36 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:31:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -462 +462 @@
     int lineCount = 0;
     int failedLines = 0;
-    psF64 tempValue = 0.0;
+    psF64 tempDbl = 0.0;
     psMetadataItem *metadataItem = NULL;
     psVector *tempVec = NULL;
@@ -508 +508 @@
             } else if(repeatedChars(linePtr, '*') > 1) {
                 failedLines++;
-                psError(__func__, "More than one @ charecter not allowed. Line %d: %s", lineCount, line);
+                psError(__func__, "More than one * charecter not allowed. Line %d: %s", lineCount, line);
                 continue;
             } else if(repeatedChars(linePtr, '~') > 0) {
@@ -515 +515 @@
                 continue;
             }
-
 
             // Get metadata item name
@@ -616 +615 @@
             case PS_META_F32:
             case PS_META_F64:
-                tempValue = parseValue(strValue, &status);
+                tempDbl = parseValue(strValue, &status);
                 if(!status) {
-                    psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempValue);
+                    psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempDbl);
                 } else {
                     status = 0;

trunk/psLib/src/xml/psXML.c

@@ -9 +9 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-07 02:16:36 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-07 19:31:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -462 +462 @@
     int lineCount = 0;
     int failedLines = 0;
-    psF64 tempValue = 0.0;
+    psF64 tempDbl = 0.0;
     psMetadataItem *metadataItem = NULL;
     psVector *tempVec = NULL;
@@ -508 +508 @@
             } else if(repeatedChars(linePtr, '*') > 1) {
                 failedLines++;
-                psError(__func__, "More than one @ charecter not allowed. Line %d: %s", lineCount, line);
+                psError(__func__, "More than one * charecter not allowed. Line %d: %s", lineCount, line);
                 continue;
             } else if(repeatedChars(linePtr, '~') > 0) {
@@ -515 +515 @@
                 continue;
             }
-
 
             // Get metadata item name
@@ -616 +615 @@
             case PS_META_F32:
             case PS_META_F64:
-                tempValue = parseValue(strValue, &status);
+                tempDbl = parseValue(strValue, &status);
                 if(!status) {
-                    psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempValue);
+                    psMetadataAdd(*md, PS_LIST_TAIL, strName, mdType, strComment, tempDbl);
                 } else {
                     status = 0;