IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1844


Ignore:
Timestamp:
Sep 21, 2004, 1:27:55 PM (22 years ago)
Author:
evanalst
Message:

Changed argument sequence in psMetadataAddItem as specified in SDR-07.

Location:
trunk/psLib/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astronomy/psMetadata.c

    r1746 r1844  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2004-09-09 02:22:56 $
     14*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2004-09-21 23:27:55 $
    1616*
    1717*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    232232}
    233233
    234 bool psMetadataAddItem( psMetadata *restrict md, int where, psMetadataItem *restrict metadataItem )
     234bool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, int location )
    235235{
    236236    char * key = NULL;
    … …  
    342342
    343343    // Add all items to metadata collection's list, even if they have the same metadata item names
    344     if(!psListAdd( mdList, where, metadataItem )) {
     344    if(!psListAdd( mdList, location, metadataItem )) {
    345345        psError( __func__, "Couldn't add metadata item to metadata collection list. Name: %s",
    346346                 metadataItem->name );
    … …  
    361361    va_end(argPtr);
    362362
    363     if (!psMetadataAddItem(md, where, metadataItem)) {
     363    if (!psMetadataAddItem(md, metadataItem, where)) {
    364364        psError(__func__, "Couldn't add metadata item to metadata collection list. Name: %s",
    365365                metadataItem->name);

  • trunk/psLib/src/astronomy/psMetadata.h

    r1621 r1844  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2004-08-25 20:21:41 $
     13*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2004-09-21 23:27:55 $
    1515*
    1616*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    152152bool psMetadataAddItem(
    153153    psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
    154     int where,                         ///< Location to be added.
    155     psMetadataItem* restrict item      ///< Metadata item to be added.
     154    psMetadataItem* restrict item,     ///< Metadata item to be added.
     155    int location                       ///< Location to be added.
    156156);
    157157

  • trunk/psLib/src/collections/psMetadata.c

    r1746 r1844  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2004-09-09 02:22:56 $
     14*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2004-09-21 23:27:55 $
    1616*
    1717*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    232232}
    233233
    234 bool psMetadataAddItem( psMetadata *restrict md, int where, psMetadataItem *restrict metadataItem )
     234bool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, int location )
    235235{
    236236    char * key = NULL;
    … …  
    342342
    343343    // Add all items to metadata collection's list, even if they have the same metadata item names
    344     if(!psListAdd( mdList, where, metadataItem )) {
     344    if(!psListAdd( mdList, location, metadataItem )) {
    345345        psError( __func__, "Couldn't add metadata item to metadata collection list. Name: %s",
    346346                 metadataItem->name );
    … …  
    361361    va_end(argPtr);
    362362
    363     if (!psMetadataAddItem(md, where, metadataItem)) {
     363    if (!psMetadataAddItem(md, metadataItem, where)) {
    364364        psError(__func__, "Couldn't add metadata item to metadata collection list. Name: %s",
    365365                metadataItem->name);

  • trunk/psLib/src/collections/psMetadata.h

    r1621 r1844  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2004-08-25 20:21:41 $
     13*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2004-09-21 23:27:55 $
    1515*
    1616*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    152152bool psMetadataAddItem(
    153153    psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
    154     int where,                         ///< Location to be added.
    155     psMetadataItem* restrict item      ///< Metadata item to be added.
     154    psMetadataItem* restrict item,     ///< Metadata item to be added.
     155    int location                       ///< Location to be added.
    156156);
    157157

  • trunk/psLib/src/types/psMetadata.c

    r1746 r1844  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2004-09-09 02:22:56 $
     14*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2004-09-21 23:27:55 $
    1616*
    1717*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    232232}
    233233
    234 bool psMetadataAddItem( psMetadata *restrict md, int where, psMetadataItem *restrict metadataItem )
     234bool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, int location )
    235235{
    236236    char * key = NULL;
    … …  
    342342
    343343    // Add all items to metadata collection's list, even if they have the same metadata item names
    344     if(!psListAdd( mdList, where, metadataItem )) {
     344    if(!psListAdd( mdList, location, metadataItem )) {
    345345        psError( __func__, "Couldn't add metadata item to metadata collection list. Name: %s",
    346346                 metadataItem->name );
    … …  
    361361    va_end(argPtr);
    362362
    363     if (!psMetadataAddItem(md, where, metadataItem)) {
     363    if (!psMetadataAddItem(md, metadataItem, where)) {
    364364        psError(__func__, "Couldn't add metadata item to metadata collection list. Name: %s",
    365365                metadataItem->name);

  • trunk/psLib/src/types/psMetadata.h

    r1621 r1844  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2004-08-25 20:21:41 $
     13*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2004-09-21 23:27:55 $
    1515*
    1616*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    152152bool psMetadataAddItem(
    153153    psMetadata* restrict md,           ///< Metadata collection to insert metadat item.
    154     int where,                         ///< Location to be added.
    155     psMetadataItem* restrict item      ///< Metadata item to be added.
     154    psMetadataItem* restrict item,     ///< Metadata item to be added.
     155    int location                       ///< Location to be added.
    156156);
    157157
Note: See TracChangeset for help on using the changeset viewer.