Changeset 9938

Timestamp:

Nov 9, 2006, 2:16:14 PM (20 years ago)

Author:

jhoblitt

Message:

in getMetadataType()

remove duplicate call to psMetadataAddItem() that was introduced when the commented out error checking was reinstated
coding style fixes

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.121 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-11-10 00:07:19 $
+*  @version $Revision: 1.122 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-11-10 00:16:14 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -561 +561 @@
 
     // Loop through line and generate metadata items for each token found
-    while((token = getToken(&linePtr," ",&status,false)) != NULL ) {
+    while((token = getToken(&linePtr, " ", &status, false)) != NULL) {
 
         // If not allocated then allocate new metadata
-        if(metadataTemplate == NULL) {
+        if (metadataTemplate == NULL) {
             metadataTemplate = psMetadataAlloc();
         }
 
         // Look for comment indicator #
-        if(strstr(token,"#") != 0) {
+        if (strstr(token, "#") != 0) {
             psFree(token);
-            break;
+            return NULL;
         }
 
         // Create metadata item to represent token read
-        tempItem = psMetadataItemAllocStr(token,"","");
-        psMetadataAddItem(metadataTemplate, tempItem, PS_LIST_TAIL, PS_META_DEFAULT);
-        if(tempItem == NULL) {
+        tempItem = psMetadataItemAllocStr(token, "", "");
+        if (tempItem == NULL) {
             psFree(metadataTemplate);
             psFree(token);
-            metadataTemplate = NULL;
-            break;
+            return NULL;
         }
 
         // Add item to template
-        if(!psMetadataAddItem(metadataTemplate, tempItem, PS_LIST_TAIL, PS_META_DEFAULT)) {
+        if (!psMetadataAddItem(metadataTemplate, tempItem, PS_LIST_TAIL, PS_META_DEFAULT)) {
             psFree(metadataTemplate);
             psFree(tempItem);
             psFree(token);
-            metadataTemplate = NULL;
-            break;
+            return NULL;
         }