Changeset 31902

Timestamp:

Jul 19, 2011, 11:17:33 AM (15 years ago)

Author:

eugene

Message:

make psMetadataItemFormat a global function (renamed from formatMetadataItem)

Location:

trunk/psLib/src/types

Files:

• psMetadataConfig.c (modified) (5 diffs)
• psMetadataConfig.h (modified) (1 diff)

trunk/psLib/src/types/psMetadataConfig.c

@@ -72 +72 @@
 static bool parseMetadataItem(char *keyName, psArray *levelArray,
                               char *linePtr, psMetadataFlags flags);
-static psString formatMetadataItem(psMetadataItem *item);
 static psArray *p_psMetadataKeyArray(psMetadata *md);
 static bool parseGeneric(char *keyName,
@@ -1337 +1336 @@
             return NULL;
         }
-        psString str = formatMetadataItem(item);
+        psString str = psMetadataItemFormat(item);
         if (!str) {
             psError(PS_ERR_UNKNOWN, false, "failed to format psMetadataItem");
@@ -1355 +1354 @@
 }
 
-
-static psString formatMetadataItem(psMetadataItem *item)
+// format a single metadata item for output (consistent with config dump I/O, includes return char)
+psString psMetadataItemFormat(psMetadataItem *item)
 {
     PS_ASSERT_METADATA_ITEM_NON_NULL(item, NULL);
@@ -1380 +1379 @@
             psMetadataItem *multiItem = NULL;
             while ((multiItem = psListGetAndIncrement(iter))) {
-                psString str = formatMetadataItem(multiItem);
+                psString str = psMetadataItemFormat(multiItem);
                 psStringAppend(&content, "%s", str);
                 psFree(str);
@@ -1597 +1596 @@
 }
 
-
 static psArray *p_psMetadataKeyArray(psMetadata *md)
 {

trunk/psLib/src/types/psMetadataConfig.h

@@ -79 +79 @@
 );
 
+/** format metadata item.
+ *
+ *  Metadata Item is formatted to a string consistent with the MDC file formats
+ *
+ *  @return char:           allocated formatted string
+*/
+psString psMetadataItemFormat(psMetadataItem *item);
+
 /** Converts a psMetadata structure (including any nested psMetadata) into a
  *  configuration file formatted string that is written out to filename.