IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6314


Ignore:
Timestamp:
Feb 2, 2006, 2:12:02 PM (20 years ago)
Author:
desonia
Message:

modified to reflect change in behaviour of psMetadataLookupPtr/Str/MD
functions.

Location:
trunk/psLib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astro/psEarthOrientation.c

    r6230 r6314  
    88 *  @author Robert Daniel DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2006-01-28 01:31:44 $
     10 *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2006-02-03 00:11:54 $
    1212 *
    1313 *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    184184    iersTable = psVectorsReadFromFile(iersTableName, iersTableFormat);
    185185    finalsTable = psVectorsReadFromFile(finalsTableName, finalsTableFormat);
    186     psFree(tableFormat);
    187     psFree(iersTableFormat);
    188     psFree(finalsTableFormat);
    189     psFree(xTableName);
    190     psFree(yTableName);
    191     psFree(sTableName);
    192     psFree(finalsTableName);
    193     psFree(iersTableName);
    194186
    195187    if(xTable == NULL || yTable == NULL || sTable == NULL) {
    … …  
    235227    memcpy(sPoly->coeff, sCoeff->data.F64,PSELEMTYPE_SIZEOF(PS_TYPE_F64)*sCoeff->n);
    236228
    237     psFree(xCoeff);
    238     psFree(yCoeff);
    239     psFree(sCoeff);
    240229    psFree(eocMetadata);
    241230

  • trunk/psLib/src/fits/psFitsTable.c

    r5519 r6314  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-11-15 22:20:13 $
     9 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2006-02-03 00:11:58 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    719719    psFree(columnNames);
    720720    psFree(columnTypes);
    721     psFree(extname);
    722721
    723722    // fill in the table elements with data
    … …  
    748747            psArray* colArray = psArrayAlloc(table->n);
    749748            for (row = 0; row < table->n; row++) {
    750                 colArray->data[row] =psMetadataLookupStr(NULL,
    751                                      table->data[row],
    752                                      item->name);
     749                colArray->data[row] = psStringCopy(psMetadataLookupStr(NULL,
     750                                                   table->data[row],
     751                                                   item->name));
    753752            }
    754753            fits_write_col_str(fits->fd,

  • trunk/psLib/src/sys/psMemory.c

    r6185 r6314  
    88*  @author Robert Lupton, Princeton University
    99*
    10 *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2006-01-23 20:44:29 $
     10*  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2006-02-03 00:11:59 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    579579    ptr->refCounter++;
    580580    pthread_mutex_unlock(&ptr->refCounterMutex);
     581
     582    // Did the user ask to be informed about this allocation?
     583    if (ptr->id == p_psMemAllocID) {
     584        p_psMemAllocID += memAllocCallback(ptr);
     585    }
    581586
    582587    return vptr;

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

    r6278 r6314  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2006-02-01 20:40:56 $
     14 *  @version $Revision: 1.99 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2006-02-03 00:12:00 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    778778        return NULL;
    779779    } else {
    780         return psMemIncrRefCounter(metadataItem->data.V);
     780        return metadataItem->data.V;
    781781    }
    782782}
    … …  
    10441044            *status = true;
    10451045        }
    1046         value = psMemIncrRefCounter(item->data.md); // The requested metadata
     1046        value = item->data.md; // The requested metadata
    10471047    }
    10481048    return value;
    … …  
    10791079            *status = true;
    10801080        }
    1081         value = psStringNCopy(item->data.V, strlen(item->data.V) );
     1081        value = item->data.V;
    10821082    }
    10831083    return value;

  • trunk/psLib/test/fits/tst_psFits.c

    r5520 r6314  
    66*  @author Robert DeSonia, MHPCC
    77*
    8 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    9 *  @date $Date: 2005-11-16 01:59:14 $
     8*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     9*  @date $Date: 2006-02-03 00:12:01 $
    1010*
    1111*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    774774        }
    775775
    776         psFree(strItem);
    777 
    778776        psFree(header);
    779777        psFree(header2);
    … …  
    859857            return 6;
    860858        }
    861 
    862         psFree(header);
    863859    }
    864860
    … …  
    904900            return 6;
    905901        }
    906 
    907         psFree(header);
    908902    }
    909903
    … …  
    10181012        }
    10191013
    1020         psFree(strItem);
    1021         psFree(vecItem);
    10221014    }
    10231015
    … …  
    13341326        }
    13351327        psFree(md);
    1336         psFree(mystr);
    13371328    }
    13381329

  • trunk/psLib/test/types/tst_psMetadata_04.c

    r5530 r6314  
    2424 *  @author  Ross Harman, MHPCC
    2525 *
    26  *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
    27  *  @date  $Date: 2005-11-16 23:07:10 $
     26 *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
     27 *  @date  $Date: 2006-02-03 00:12:02 $
    2828 *
    2929 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    204204        return 17;
    205205    }
    206     psFree(valueVec);
    207206    printFooter(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer", true);
    208207
    … …  
    302301        return 24;
    303302    }
    304     psFree(valueVec);
    305303    printFooter(stdout, "psMetadata","Test P - Attempt get psVector value of non-existant metadata item",true);
    306304
    307305    // Test Q - Free psMetadata
    308306    printPositiveTestHeader(stdout, "psMetadata", "Test Q - Free psMetadata");
    309     psFree(newSTR);
    310307    //    psFree(string);
    311308    psFree(newMD);
    312     psFree(metadata);
    313309    psFree(item1);
    314310    psFree(item2);
    … …  
    319315    psFree(item7);
    320316    psFree(item8);
    321     psFree(metaData);
     317    psFree(metadata);
    322318    if ( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) {
    323319        psError(PS_ERR_UNKNOWN, true,"memory leaks detected.");

  • trunk/psLib/test/types/tst_psMetadata_07.c

    r6213 r6314  
    1616*  @author  David Robbins, MHPCC
    1717*
    18 *  @version $Revision: 1.20 $  $Name: not supported by cvs2svn $
    19 *  @date  $Date: 2006-01-26 23:44:18 $
     18*  @version $Revision: 1.21 $  $Name: not supported by cvs2svn $
     19*  @date  $Date: 2006-02-03 00:12:02 $
    2020*
    2121*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    279279    psFree(item);
    280280    psFree(vecptr);
    281     psFree(vecptr2);
    282281    psFree(md);
    283282    return 0;
Note: See TracChangeset for help on using the changeset viewer.