Changeset 1406 for trunk/psLib/src/collections

Timestamp:

Aug 6, 2004, 12:34:06 PM (22 years ago)

Author:

desonia

Message:

astyle fixed?

Location:

trunk/psLib/src/collections

Files:

• psArray.c (modified) (1 diff)
• psBitSet.c (modified) (1 diff)
• psList.c (modified) (1 diff)
• psMetadata.c (modified) (3 diffs)
• psScalar.c (modified) (1 diff)
• psScalar.h (modified) (1 diff)
• psVector.c (modified) (1 diff)
• psVector.h (modified) (1 diff)

trunk/psLib/src/collections/psArray.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psBitSet.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psMetadata.c

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-05 23:39:23 $
+*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-06 22:34:05 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -280 +280 @@
             return false;
         }
-    } else if(value != NULL) {
-
-        // The key was found and the new metadata item is a folder node. Don't add new metadata item, since
-        // it will wipe out existing node.
-        psError( __func__, "Metadata already exists in metadata collection. Item not added. Name: %s",
-                 metadataItem->name );
-        return false;
-    } else {
-
-        // Duplicate key not found. Add new metadata item to metadata collection's hash
-        if(!psHashAdd( mdTable, key, metadataItem )) {
-            psError( __func__, "Couldn't add metadata item to metadata collection table. Name: %s",
+    } else
+        if(value != NULL) {
+
+            // The key was found and the new metadata item is a folder node. Don't add new metadata item, since
+            // it will wipe out existing node.
+            psError( __func__, "Metadata already exists in metadata collection. Item not added. Name: %s",
                      metadataItem->name );
             return false;
-        }
-    }
+        } else {
+
+            // Duplicate key not found. Add new metadata item to metadata collection's hash
+            if(!psHashAdd( mdTable, key, metadataItem )) {
+                psError( __func__, "Couldn't add metadata item to metadata collection table. Name: %s",
+                         metadataItem->name );
+                return false;
+            }
+        }
 
     // Add all items to metadata collection's list, even if they have the same metadata item names
@@ -612 +613 @@
         psError( __func__, "Null extName and extNum = 0 not allowed" );
         return NULL;
-    } else if(extName && extNum) {
-        psError( __func__, "Both extName and extNum arguments should not have non zero values." );
-        return NULL;
-    }
+    } else
+        if(extName && extNum) {
+            psError( __func__, "Both extName and extNum arguments should not have non zero values." );
+            return NULL;
+        }
 
     // Allocate metadata if user didn't

trunk/psLib/src/collections/psScalar.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psScalar.h

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psVector.c

@@ -8 +8 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-06 21:50:13 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-06 22:34:05 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii