Changeset 15495

Timestamp:

Nov 7, 2007, 4:59:00 PM (19 years ago)

Author:

Paul Price

Message:

No need to cut strings off at 1024 characters.

File:

• trunk/psLib/src/types/psMetadata.c (modified) (5 diffs)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.162 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-07-04 01:36:14 $
+ *  @version $Revision: 1.163 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-11-08 02:59:00 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -49 +49 @@
 /******************************************************************************/
 
-/** Maximum size of a string */
-#define MAX_STRING_LENGTH 1024
+// None
 
 /******************************************************************************/
@@ -278 +277 @@
         {
             char *string = va_arg(argPtr, char *);
-            metadataItem->data.str =
-                string ? psStringNCopy(string, MAX_STRING_LENGTH)
-                : NULL;
+            metadataItem->data.str = string ? psStringCopy(string) : NULL;
         }
         break;
@@ -526 +523 @@
 }
 
-// this function copies the input metadata to the output, supplementing existing metadata 
+// this function copies the input metadata to the output, supplementing existing metadata
 // folders with the contents from corresponding folders in the output
 bool p_psMetadataOverlay(const char *file,
-                         unsigned int lineno,
-                         const char *func,
-                         psMetadata *out,
-                         const psMetadata *in)
+                         unsigned int lineno,
+                         const char *func,
+                         psMetadata *out,
+                         const psMetadata *in)
 {
     PS_ASSERT_METADATA_NON_NULL(in, NULL);
@@ -551 +548 @@
         psTrace("psLib.types", 5, "Copying %s (%s)...\n", inItem->name, inItem->comment);
 
-        // if this is a metadata, and it has a corresponding match, overlay them
-        if (inItem->type == PS_DATA_METADATA) {
-            bool status;
-            psMetadata *outFolder = psMetadataLookupMetadata (&status, out, inItem->name);
-            if (outFolder) {
-                if (!psMetadataOverlay (outFolder, inItem->data.md)) {
-                    fprintf (stderr, "Error overlaying metadata folder\n");
-                    result = false;
-                }
-                continue;
-            }
-        }
+        // if this is a metadata, and it has a corresponding match, overlay them
+        if (inItem->type == PS_DATA_METADATA) {
+            bool status;
+            psMetadata *outFolder = psMetadataLookupMetadata (&status, out, inItem->name);
+            if (outFolder) {
+                if (!psMetadataOverlay (outFolder, inItem->data.md)) {
+                    fprintf (stderr, "Error overlaying metadata folder\n");
+                    result = false;
+                }
+                continue;
+            }
+        }
 
         // Copy the item and add it on.  report all errors so we get a listing