IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2637


Ignore:
Timestamp:
Dec 6, 2004, 10:00:03 AM (22 years ago)
Author:
harman
Message:

Updates for version 10 of SDRS

Location:
trunk/psLib/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r2614 r2637  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2004-12-03 23:50:31 $
     11*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2004-12-06 19:59:57 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    309309/*****************************************************************************/
    310310
    311 void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem)
     311bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* metadataItem)
    312312{
    313313    psMetadataType type;
    314314    psElemType pType;
    315 
    316     PS_PTR_CHECK_NULL(fd,);
    317     PS_PTR_CHECK_NULL(format,);
    318     PS_PTR_CHECK_NULL(metadataItem,);
     315    psBool success = false;
     316
     317    PS_PTR_CHECK_NULL(fd, success);
     318    PS_PTR_CHECK_NULL(format, success);
     319    PS_PTR_CHECK_NULL(metadataItem, success);
    319320
    320321    type = metadataItem->type;
    … …  
    338339        default:
    339340            psError(PS_ERR_BAD_PARAMETER_TYPE,true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)pType);
     341            success = false;
    340342        }
    341343        break;
    … …  
    345347    default:
    346348        psError(PS_ERR_BAD_PARAMETER_TYPE,true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)type);
    347     }
     349        success = false;
     350    }
     351
     352    success = true;
     353
     354    return success;
    348355}
    349356

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

    r2607 r2637  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2004-12-03 23:14:46 $
     11*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2004-12-06 20:00:03 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3434 * @return psMetadataItem* : Pointer metadata item.
    3535 */
    36 void psMetadataItemPrint(
     36bool psMetadataItemPrint(
    3737    FILE * fd,                         ///< Pointer to file to write metadata item.
    3838    const char *format,                ///< Format to print metadata item.
    39     const psMetadataItem* restrict metadataItem ///< Metadata item to print.
     39    const psMetadataItem* metadataItem ///< Metadata item to print.
    4040);
    4141

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

    r2614 r2637  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2004-12-03 23:50:31 $
     11*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2004-12-06 19:59:57 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    309309/*****************************************************************************/
    310310
    311 void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem)
     311bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* metadataItem)
    312312{
    313313    psMetadataType type;
    314314    psElemType pType;
    315 
    316     PS_PTR_CHECK_NULL(fd,);
    317     PS_PTR_CHECK_NULL(format,);
    318     PS_PTR_CHECK_NULL(metadataItem,);
     315    psBool success = false;
     316
     317    PS_PTR_CHECK_NULL(fd, success);
     318    PS_PTR_CHECK_NULL(format, success);
     319    PS_PTR_CHECK_NULL(metadataItem, success);
    319320
    320321    type = metadataItem->type;
    … …  
    338339        default:
    339340            psError(PS_ERR_BAD_PARAMETER_TYPE,true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)pType);
     341            success = false;
    340342        }
    341343        break;
    … …  
    345347    default:
    346348        psError(PS_ERR_BAD_PARAMETER_TYPE,true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)type);
    347     }
     349        success = false;
     350    }
     351
     352    success = true;
     353
     354    return success;
    348355}
    349356

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

    r2607 r2637  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2004-12-03 23:14:46 $
     11*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2004-12-06 20:00:03 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3434 * @return psMetadataItem* : Pointer metadata item.
    3535 */
    36 void psMetadataItemPrint(
     36bool psMetadataItemPrint(
    3737    FILE * fd,                         ///< Pointer to file to write metadata item.
    3838    const char *format,                ///< Format to print metadata item.
    39     const psMetadataItem* restrict metadataItem ///< Metadata item to print.
     39    const psMetadataItem* metadataItem ///< Metadata item to print.
    4040);
    4141

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

    r2614 r2637  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2004-12-03 23:50:31 $
     11*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2004-12-06 19:59:57 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    309309/*****************************************************************************/
    310310
    311 void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem)
     311bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* metadataItem)
    312312{
    313313    psMetadataType type;
    314314    psElemType pType;
    315 
    316     PS_PTR_CHECK_NULL(fd,);
    317     PS_PTR_CHECK_NULL(format,);
    318     PS_PTR_CHECK_NULL(metadataItem,);
     315    psBool success = false;
     316
     317    PS_PTR_CHECK_NULL(fd, success);
     318    PS_PTR_CHECK_NULL(format, success);
     319    PS_PTR_CHECK_NULL(metadataItem, success);
    319320
    320321    type = metadataItem->type;
    … …  
    338339        default:
    339340            psError(PS_ERR_BAD_PARAMETER_TYPE,true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)pType);
     341            success = false;
    340342        }
    341343        break;
    … …  
    345347    default:
    346348        psError(PS_ERR_BAD_PARAMETER_TYPE,true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)type);
    347     }
     349        success = false;
     350    }
     351
     352    success = true;
     353
     354    return success;
    348355}
    349356

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

    r2607 r2637  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2004-12-03 23:14:46 $
     11*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2004-12-06 20:00:03 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3434 * @return psMetadataItem* : Pointer metadata item.
    3535 */
    36 void psMetadataItemPrint(
     36bool psMetadataItemPrint(
    3737    FILE * fd,                         ///< Pointer to file to write metadata item.
    3838    const char *format,                ///< Format to print metadata item.
    39     const psMetadataItem* restrict metadataItem ///< Metadata item to print.
     39    const psMetadataItem* metadataItem ///< Metadata item to print.
    4040);
    4141

  • trunk/psLib/src/xml/psXML.c

    r2614 r2637  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2004-12-03 23:50:31 $
     11*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2004-12-06 19:59:57 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    309309/*****************************************************************************/
    310310
    311 void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem)
     311bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* metadataItem)
    312312{
    313313    psMetadataType type;
    314314    psElemType pType;
    315 
    316     PS_PTR_CHECK_NULL(fd,);
    317     PS_PTR_CHECK_NULL(format,);
    318     PS_PTR_CHECK_NULL(metadataItem,);
     315    psBool success = false;
     316
     317    PS_PTR_CHECK_NULL(fd, success);
     318    PS_PTR_CHECK_NULL(format, success);
     319    PS_PTR_CHECK_NULL(metadataItem, success);
    319320
    320321    type = metadataItem->type;
    … …  
    338339        default:
    339340            psError(PS_ERR_BAD_PARAMETER_TYPE,true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)pType);
     341            success = false;
    340342        }
    341343        break;
    … …  
    345347    default:
    346348        psError(PS_ERR_BAD_PARAMETER_TYPE,true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, (int)type);
    347     }
     349        success = false;
     350    }
     351
     352    success = true;
     353
     354    return success;
    348355}
    349356

  • trunk/psLib/src/xml/psXML.h

    r2607 r2637  
    99*  @author Ross Harman, MHPCC
    1010*
    11 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2004-12-03 23:14:46 $
     11*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2004-12-06 20:00:03 $
    1313*
    1414*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3434 * @return psMetadataItem* : Pointer metadata item.
    3535 */
    36 void psMetadataItemPrint(
     36bool psMetadataItemPrint(
    3737    FILE * fd,                         ///< Pointer to file to write metadata item.
    3838    const char *format,                ///< Format to print metadata item.
    39     const psMetadataItem* restrict metadataItem ///< Metadata item to print.
     39    const psMetadataItem* metadataItem ///< Metadata item to print.
    4040);
    4141
Note: See TracChangeset for help on using the changeset viewer.