Changeset 5760 for trunk/psModules/src

Timestamp:

Dec 12, 2005, 10:11:07 AM (21 years ago)

Author:

desonia

Message:

Changes from Bug #627 -- replaced sed with perl and a couple of GCC 4 related
fixes.

Location:

trunk/psModules/src

Files:

• config/pmConfig.c (modified) (3 diffs)
• objects/pmObjects.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-15 20:09:03 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-12 20:11:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
     const char *description)            // Description of file
 {
-    int numBadLines = 0;
+    unsigned int numBadLines = 0;
 
     psLogMsg(__func__, PS_LOG_INFO, "Loading %s configuration from file %s\n",
@@ -359 +359 @@
         } else if (cameraItem->type == PS_DATA_STRING) {
             psTrace(__func__, 5, "Reading camera configuration for %s...\n", cameraItem->name);
-            int badLines = 0;  // Number of bad lines in reading camera configuration
+            unsigned int badLines = 0;  // Number of bad lines in reading camera configuration
             camera = psMetadataConfigParse(NULL, &badLines, cameraItem->data.V, true);
             if (badLines > 0) {

trunk/psModules/src/objects/pmObjects.h

@@ -10 +10 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-10 19:53:40 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-12 20:11:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -36 +36 @@
  * values with specific meanings that other functions can add to or define?
  */
-enum {
+typedef enum {
     PSPHOT_MASK_CLEAR     = 0x00,
     PSPHOT_MASK_INVALID   = 0x01,