IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4307


Ignore:
Timestamp:
Jun 17, 2005, 1:39:51 PM (21 years ago)
Author:
drobbin
Message:

* empty log message *

Location:
trunk/psLib/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r3682 r4307  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-04-07 20:27:41 $
     11 *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-17 23:39:51 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    109109}
    110110
    111 psBool psArrayRemove(psArray* psArr,
    112                      psPtr data)
    113 {
    114     psBool success = false;
    115 
    116     if (psArr == NULL) {
     111bool psArrayRemove(psArray* array,
     112                   const psPtr data)
     113{
     114    bool success = false;
     115
     116    if (array == NULL) {
    117117        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    118118                PS_ERRORTEXT_psArray_ARRAY_NULL);
    … …  
    120120    }
    121121
    122     psS32 n = psArr->n;
    123     psPtr* psArrData = psArr->data;
     122    psS32 n = array->n;
     123    psPtr* psArrData = array->data;
    124124    for (psS32 i = n-1; i >= 0; i--) {
    125125        if (psArrData[i] == data) {
    126             memmove(&psArr->data[i],&psArr->data[i+1],(n-i-1)*sizeof(psPtr));
     126            memmove(&array->data[i],&array->data[i+1],(n-i-1)*sizeof(psPtr));
    127127            n--;
    128128            success = true;
    129129        }
    130130    }
    131     psArr->n = n; // reset the array size to indicate the removed item(s)
     131    array->n = n; // reset the array size to indicate the removed item(s)
    132132
    133133    return success;

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

    r4162 r4307  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-08 23:40:45 $
     14 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-17 23:39:51 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9191 *
    9292 */
    93 psBool psArrayRemove(
    94     psArray* psArr,                    ///< array to operate on
    95     psPtr data                         ///< the data pointer to remove from psArray
     93bool psArrayRemove(
     94    psArray* array,                    ///< array to operate on
     95    const psPtr data                   ///< the data pointer to remove from psArray
    9696);
    9797

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

    r3264 r4307  
    1010 *  @author Eric Van Alst, MHPCC
    1111 *   
    12  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-02-17 19:26:24 $
     12 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-17 23:39:51 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2121#include "psLogMsg.h"
    2222
    23 void psAbort(const char *name, const char *fmt, ...)
     23void psAbort(const char *name, const char *format, ...)
    2424{
    2525    va_list argPtr;             // variable list arguement pointer
    2626
    2727    // Get the variable list parameters to pass to logging function
    28     va_start(argPtr, fmt);
     28    va_start(argPtr, format);
    2929
    3030    // Call logging function with PS_LOG_ABORT level
    31     psLogMsgV(name, PS_LOG_ABORT, fmt, argPtr);
     31    psLogMsgV(name, PS_LOG_ABORT, format, argPtr);
    3232
    3333    // Clean up stack after variable arguement has been used

  • trunk/psLib/src/sys/psAbort.h

    r4162 r4307  
    1212 *  @author Eric Van Alst, MHPCC
    1313 *
    14  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-08 23:40:45 $
     14 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-17 23:39:51 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3939void psAbort(
    4040    const char *name,                  ///< Source of abort such as file or function detected
    41     const char *fmt,                   ///< A printf style formatting statement defining msg
     41    const char *format,                   ///< A printf style formatting statement defining msg
    4242    ...
    4343);

  • trunk/psLib/src/sysUtils/psAbort.c

    r3264 r4307  
    1010 *  @author Eric Van Alst, MHPCC
    1111 *   
    12  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-02-17 19:26:24 $
     12 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-17 23:39:51 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2121#include "psLogMsg.h"
    2222
    23 void psAbort(const char *name, const char *fmt, ...)
     23void psAbort(const char *name, const char *format, ...)
    2424{
    2525    va_list argPtr;             // variable list arguement pointer
    2626
    2727    // Get the variable list parameters to pass to logging function
    28     va_start(argPtr, fmt);
     28    va_start(argPtr, format);
    2929
    3030    // Call logging function with PS_LOG_ABORT level
    31     psLogMsgV(name, PS_LOG_ABORT, fmt, argPtr);
     31    psLogMsgV(name, PS_LOG_ABORT, format, argPtr);
    3232
    3333    // Clean up stack after variable arguement has been used

  • trunk/psLib/src/sysUtils/psAbort.h

    r4162 r4307  
    1212 *  @author Eric Van Alst, MHPCC
    1313 *
    14  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-08 23:40:45 $
     14 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-17 23:39:51 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3939void psAbort(
    4040    const char *name,                  ///< Source of abort such as file or function detected
    41     const char *fmt,                   ///< A printf style formatting statement defining msg
     41    const char *format,                   ///< A printf style formatting statement defining msg
    4242    ...
    4343);

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

    r3682 r4307  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-04-07 20:27:41 $
     11 *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-17 23:39:51 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    109109}
    110110
    111 psBool psArrayRemove(psArray* psArr,
    112                      psPtr data)
    113 {
    114     psBool success = false;
    115 
    116     if (psArr == NULL) {
     111bool psArrayRemove(psArray* array,
     112                   const psPtr data)
     113{
     114    bool success = false;
     115
     116    if (array == NULL) {
    117117        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    118118                PS_ERRORTEXT_psArray_ARRAY_NULL);
    … …  
    120120    }
    121121
    122     psS32 n = psArr->n;
    123     psPtr* psArrData = psArr->data;
     122    psS32 n = array->n;
     123    psPtr* psArrData = array->data;
    124124    for (psS32 i = n-1; i >= 0; i--) {
    125125        if (psArrData[i] == data) {
    126             memmove(&psArr->data[i],&psArr->data[i+1],(n-i-1)*sizeof(psPtr));
     126            memmove(&array->data[i],&array->data[i+1],(n-i-1)*sizeof(psPtr));
    127127            n--;
    128128            success = true;
    129129        }
    130130    }
    131     psArr->n = n; // reset the array size to indicate the removed item(s)
     131    array->n = n; // reset the array size to indicate the removed item(s)
    132132
    133133    return success;

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

    r4162 r4307  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-08 23:40:45 $
     14 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-17 23:39:51 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9191 *
    9292 */
    93 psBool psArrayRemove(
    94     psArray* psArr,                    ///< array to operate on
    95     psPtr data                         ///< the data pointer to remove from psArray
     93bool psArrayRemove(
     94    psArray* array,                    ///< array to operate on
     95    const psPtr data                   ///< the data pointer to remove from psArray
    9696);
    9797
Note: See TracChangeset for help on using the changeset viewer.