Changeset 1440 for trunk/psLib/src/collections/psMetadata.c

Timestamp:

Aug 9, 2004, 1:34:58 PM (22 years ago)

Author:

desonia

Message:

cleanup of some indent-induced madness.

File:

• trunk/psLib/src/collections/psMetadata.c (modified) (22 diffs)

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-09 23:06:10 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-09 23:34:57 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -88 +88 @@
 
 /*****************************************************************************/
-static void metadataItemFree(psMetadataItem * metadataItem)
+static void metadataItemFree(psMetadataItem* metadataItem)
 {
     psMetadataType type;
@@ -109 +109 @@
 }
 
-static void metadataFree(psMetadata * metadata)
+static void metadataFree(psMetadata* metadata)
 {
     if (metadata == NULL) {
@@ -124 +124 @@
 /*****************************************************************************/
 
-psMetadataItem *psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...)
+psMetadataItem* psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...)
 {
     va_list argPtr;
-    psMetadataItem *metadataItem = NULL;
+    psMetadataItem* metadataItem = NULL;
 
     // Get the variable list parameters to pass to allocation function
@@ -141 +141 @@
 }
 
-psMetadataItem *psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment,
+psMetadataItem* psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment,
                                      va_list argPtr)
 {
-    psMetadataItem *metadataItem = NULL;
+    psMetadataItem* metadataItem = NULL;
 
     if (name == NULL) {
@@ -151 +151 @@
     }
     // Allocate metadata item
-    metadataItem = (psMetadataItem *) psAlloc(sizeof(psMetadataItem));
+    metadataItem = (psMetadataItem* ) psAlloc(sizeof(psMetadataItem));
     if (metadataItem == NULL) {
         psAbort(__func__, "Failed to allocate memory");
@@ -211 +211 @@
 }
 
-psMetadata *psMetadataAlloc(void)
-{
-    psList *list = NULL;
-    psHash *table = NULL;
-    psMetadata *metadata = NULL;
+psMetadata* psMetadataAlloc(void)
+{
+    psList* list = NULL;
+    psHash* table = NULL;
+    psMetadata* metadata = NULL;
 
     // Allocate metadata
-    metadata = (psMetadata *) psAlloc(sizeof(psMetadata));
+    metadata = (psMetadata* ) psAlloc(sizeof(psMetadata));
     if (metadata == NULL) {
         psAbort(__func__, "Failed to allocate metadata");
@@ -226 +226 @@
 
     // Allocate metadata's internal containers
-    list = (psList *) psListAlloc(NULL);
+    list = (psList* ) psListAlloc(NULL);
     if (list == NULL) {
         psAbort(__func__, "Failed to allocate list");
     }
 
-    table = (psHash *) psHashAlloc(10);
+    table = (psHash* ) psHashAlloc(10);
     if (table == NULL) {
         psAbort(__func__, "Failed to allocate table");
@@ -242 +242 @@
 }
 
-bool psMetadataAddItem(psMetadata * restrict md, int where, psMetadataItem * restrict metadataItem)
+bool psMetadataAddItem(psMetadata* restrict md, int where, psMetadataItem* restrict metadataItem)
 {
     char *key = NULL;
-    psHash *mdTable = NULL;
-    psList *mdList = NULL;
-    psMetadataItem *value = NULL;
+    psHash* mdTable = NULL;
+    psList* mdList = NULL;
+    psMetadataItem* value = NULL;
     psMetadataType type = PS_META_ITEM_SET;
 
@@ -280 +280 @@
     }
     // Check if key is already in table
-    value = (psMetadataItem *) psHashLookup(mdTable, key);
+    value = (psMetadataItem* ) psHashLookup(mdTable, key);
     if (value != NULL && type != PS_META_ITEM_SET) {
 
@@ -316 +316 @@
 }
 
-bool psMetadataAdd(psMetadata * restrict md, int where, const char *name, psMetadataType type,
+bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type,
                    const char *comment, ...)
 {
     va_list argPtr;
-    psMetadataItem *metadataItem = NULL;
+    psMetadataItem* metadataItem = NULL;
 
     va_start(argPtr, comment);
@@ -339 +339 @@
 }
 
-bool psMetadataRemove(psMetadata * restrict md, int where, const char *restrict key)
+bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key)
 {
     int numChildren = 0;
-    psList *mdList = NULL;
-    psHash *mdTable = NULL;
-    psMetadataItem *entry = NULL;
-    psMetadataItem *entryChild = NULL;
+    psList* mdList = NULL;
+    psHash* mdTable = NULL;
+    psMetadataItem* entry = NULL;
+    psMetadataItem* entryChild = NULL;
 
 
@@ -368 +368 @@
 
         // Remove by key name
-        entry = (psMetadataItem *) psHashLookup(mdTable, key);
+        entry = (psMetadataItem* ) psHashLookup(mdTable, key);
         if (entry == NULL) {
             psError(__func__, "Couldn't find metadata item. Name: %s", key);
@@ -419 +419 @@
 }
 
-psMetadataItem *psMetadataLookup(psMetadata * restrict md, const char *restrict key)
-{
-    psHash *mdTable = NULL;
-    psMetadataItem *entry = NULL;
+psMetadataItem* psMetadataLookup(psMetadata* restrict md, const char *restrict key)
+{
+    psHash* mdTable = NULL;
+    psMetadataItem* entry = NULL;
 
 
@@ -441 +441 @@
     }
 
-    entry = (psMetadataItem *) psHashLookup(mdTable, key);
+    entry = (psMetadataItem* ) psHashLookup(mdTable, key);
     if (entry == NULL) {
         psError(__func__, "Could not find metadata item. Key: %s", key);
@@ -450 +450 @@
 }
 
-psMetadataItem *psMetadataGet(psMetadata * restrict md, int where)
-{
-    psList *mdList = NULL;
-    psMetadataItem *entry = NULL;
+psMetadataItem* psMetadataGet(psMetadata* restrict md, int where)
+{
+    psList* mdList = NULL;
+    psMetadataItem* entry = NULL;
 
 
@@ -467 +467 @@
     }
 
-    entry = (psMetadataItem *) psListGet(mdList, where);
+    entry = (psMetadataItem* ) psListGet(mdList, where);
     if (entry == NULL) {
         psError(__func__, "Couldn't find metadata item with given index. Index: %d", where);
@@ -476 +476 @@
 }
 
-bool psMetadataSetIterator(psMetadata * restrict md, int where)
-{
-    psList *mdList = NULL;
+bool psMetadataSetIterator(psMetadata* restrict md, int where)
+{
+    psList* mdList = NULL;
 
     if (md == NULL) {
@@ -496 +496 @@
 }
 
-psMetadataItem *psMetadataGetNext(psMetadata * restrict md, const char *restrict match, int which)
-{
-    psList *mdList = NULL;
-    psMetadataItem *entry = NULL;
+psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which)
+{
+    psList* mdList = NULL;
+    psMetadataItem* entry = NULL;
 
     mdList = md->list;
@@ -532 +532 @@
 }
 
-psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, const char *restrict match, int which)
-{
-    psList *mdList = NULL;
-    psMetadataItem *entry = NULL;
+psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which)
+{
+    psList* mdList = NULL;
+    psMetadataItem* entry = NULL;
 
     mdList = md->list;
@@ -568 +568 @@
 }
 
-void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem * restrict metadataItem)
+void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem)
 {
     psMetadataType type;
@@ -616 +616 @@
 }
 
-psMetadata *psMetadataFReadHeader(psMetadata * output, char *extName, int extNum, fitsfile * fd)
+psMetadata* psMetadataFReadHeader(psMetadata* output, char *extName, int extNum, fitsfile * fd)
 {
     bool tempBool;