IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Nov 3, 2004, 3:05:00 PM (22 years ago)
Author:
desonia
Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/collections/tst_psMetadata_03.c

    r2204 r2273  
    1414*  @author  Ross Harman, MHPCC
    1515*
    16 *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
    17 *  @date  $Date: 2004-10-27 00:57:33 $
     16*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
     17*  @date  $Date: 2004-11-04 01:05:00 $
    1818*
    1919*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    9191    printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name");
    9292    if( ! psMetadataAddItem(metadata, item1, PS_LIST_HEAD) ) {
    93         psError(__func__,"psMetadataAddItem did not return true when adding by name.");
     93        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
    9494        return 10;
    9595    }
    9696    if( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2",PS_META_S32,"I am S32 integer",77) ) {
    97         psError(__func__,"psMetadataAddItem did not return true when adding by name.");
     97        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
    9898        return 11;
    9999    }
    100100    if ( ! psMetadataRemove(metadata, 0, "myItem1" ) ) {
    101         psError(__func__,"psMetadataRemove did not return true when removing by name.");
     101        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name.");
    102102        return 12;
    103103    }
    104104    if ( ! psMetadataRemove(metadata, 0, "myItem2" ) ) {
    105         psError(__func__,"psMetadataRemove did not return true when removing by name.");
     105        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by name.");
    106106        return 13;
    107107    }
    … …  
    112112    printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index");
    113113    if ( ! psMetadataAddItem(metadata, item3, PS_LIST_HEAD) ) {
    114         psError(__func__,"psMetadataAddItem did not return true when adding by index.");
     114        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
    115115        return 14;
    116116    }
    117117    if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4",PS_META_S32,"I am S32 integer",88) ) {
    118         psError(__func__,"psMetadataAddItem did not return true when adding by index.");
     118        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
    119119        return 15;
    120120    }
    121121    if( ! psMetadataRemove(metadata, 0, NULL) ) {
    122         psError(__func__,"psMetadataRemove did not return true when removing by index.");
     122        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index.");
    123123        return 16;
    124124    }
    125125    if ( ! psMetadataRemove(metadata, 0, NULL ) ) {
    126         psError(__func__,"psMetadataRemove did not return true when removing by index.");
     126        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return true when removing by index.");
    127127        return 17;
    128128    }
    … …  
    134134                            "Null metadata collection not allowed", 0);
    135135    if ( psMetadataRemove(NULL, 0, NULL) ) {
    136         psError(__func__,"psMetadataRemove did not return false when removing from null metadata.");
     136        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing from null metadata.");
    137137        return 18;
    138138    }
    … …  
    144144                            "Couldn't find metadata item. Name: AARGH", 0);
    145145    if( psMetadataRemove(metadata, 0, "AARGH") ) {
    146         psError(__func__,"psMetadataRemove did not return false when removing non-existant item.");
     146        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item.");
    147147        return 19;
    148148    }
    … …  
    154154                            "Couldn't find metadata item in list. Index: 22", 0);
    155155    if( psMetadataRemove(metadata, 22, NULL) ) {
    156         psError(__func__,"psMetadataRemove did not return false when removing non-existant item.");
     156        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false when removing non-existant item.");
    157157        return 20;
    158158    }
    … …  
    167167    errMetadata->table = NULL;
    168168    if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) {
    169         psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
     169        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
    170170        return 21;
    171171    }
    172172    if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) {
    173         psError(__func__,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table.");
     173        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o hash table.");
    174174        return 31;
    175175    }
    … …  
    183183    errMetadata->list = NULL;
    184184    if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) {
    185         psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list.");
     185        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list.");
    186186        return 22;
    187187    }
    188188    if ( psMetadataRemove(errMetadata, PS_LIST_HEAD, "errItem") ) {
    189         psError(__func__,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list.");
     189        psError(PS_ERR_UNKNOWN, true,"psMetadataRemove did not return false w/ invalid metadata struct w/o link list.");
    190190        return 32;
    191191    }
    … …  
    199199    errItem->name = NULL;
    200200    if ( psMetadataAddItem(errMetadata, errItem, PS_LIST_HEAD) ) {
    201         psError(__func__,"psMetadataAddItem did not return false with item with null name.");
     201        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false with item with null name.");
    202202        return 23;
    203203    }
    … …  
    211211    errMetadata->table = NULL;
    212212    if ( psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32,"Integer",22) ) {
    213         psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
     213        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
    214214        return 24;
    215215    }
    … …  
    227227    psFree(errMetadata);
    228228    if( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
    229         psError(__func__,"Memory leaks detected.");
     229        psError(PS_ERR_UNKNOWN, true,"Memory leaks detected.");
    230230        return 25;
    231231    }
Note: See TracChangeset for help on using the changeset viewer.