IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4409 for trunk/psLib/src/sys


Ignore:
Timestamp:
Jun 28, 2005, 10:17:52 AM (21 years ago)
Author:
drobbin
Message:

updated files in accordance with requested revisions in apidelta-report-cycle6

Location:
trunk/psLib/src/sys
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib/src/sys/psString.c

    r3997 r4409  
    1212 *  @author Eric Van Alst, MHPCC
    1313 *
    14  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-05-20 01:41:17 $
     14 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-28 20:17:52 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    2626#include "psSysUtilsErrors.h"
    2727
    28 char *psStringCopy(const char *str)
     28psString psStringCopy(const char *string)
    2929{
    3030    // Allocate memory using psAlloc function
    3131    // Copy input string to memory just allocated
    3232    // Return the copy
    33     return strcpy(psAlloc(strlen(str) + 1), str);
     33    return strcpy(psAlloc(strlen(string) + 1), string);
    3434}
    3535
    36 char *psStringNCopy(const char *str, psS32 nChar)
     36psString psStringNCopy(const char *string, int nChar)
    3737{
    3838    char *returnValue = NULL;
     
    4949    // Copy input string to memory allocated up to nChar characters
    5050    // Return the copy
    51     returnValue = strncpy(psAlloc((size_t) nChar + 1), str, (size_t) nChar);
     51    returnValue = strncpy(psAlloc((size_t) nChar + 1), string, (size_t) nChar);
    5252
    5353    // Ensure the last byte is NULL character
  • trunk/psLib/src/sys/psString.h

    r4162 r4409  
    1313 *  @author Eric Van Alst, MHPCC
    1414 *
    15  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    16  *  @date $Date: 2005-06-08 23:40:45 $
     15 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     16 *  @date $Date: 2005-06-28 20:17:52 $
    1717 *
    1818 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    3939 *  plus one and copy the input string to the newly allocated memory.
    4040 *
    41  *  @return char*      Copy of input string
     41 *  @return psString:      Copy of input string
    4242 *
    4343 */
    44 char *psStringCopy(
    45     const char *str
    46     /**< Input string of characters to copy */
     44psString psStringCopy(
     45    const char *string                 ///< Input string of characters to copy
    4746);
    4847
     
    5756 *  be set to NULL.
    5857 *
    59  *  @return  char* Copy of input string
     58 *  @return  psString:  Copy of input string
    6059 *
    6160 */
     
    6362/*@null@*/
    6463
    65 char *psStringNCopy(
    66     const char *str,
    67     /**< Input string of characters to copy */
    68 
    69     psS32 nChar
    70     /**< Number of bytes to allocate for string copy */
     64psString psStringNCopy(
     65    const char *string,                ///< Input string of characters to copy
     66    int nChar                          ///< Number of bytes to allocate for string copy
    7167);
    7268
  • trunk/psLib/src/sys/psTrace.c

    r4392 r4409  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-06-25 02:02:05 $
     11 *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-28 20:17:52 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    5757
    5858static void componentFree(p_psComponent* comp);
    59 static p_psComponent* componentAlloc(const char *name, psS32 level);
     59static p_psComponent* componentAlloc(const char *name, int level);
    6060
    6161/*****************************************************************************
    6262componentAlloc(): allocate memory for a new node, and initialize members.
    6363 *****************************************************************************/
    64 static p_psComponent* componentAlloc(const char *name, psS32 level)
     64static p_psComponent* componentAlloc(const char *name, int level)
    6565{
    6666    p_psComponent* comp = psAlloc(sizeof(p_psComponent));
     
    245245*****************************************************************************/
    246246psBool psTraceSetLevel(const char *comp,   // component of interest
    247                        psS32 level)  // desired trace level
     247                       int level)  // desired trace level
    248248{
    249249    char *compName = NULL;
     
    487487 *****************************************************************************/
    488488void p_psTrace(const char *comp,        // component being traced
    489                psS32 level,       // desired trace level
    490                ...)             // arguments
     489               int level,               // desired trace level
     490               ...)                     // arguments
    491491{
    492492    char *fmt = NULL;
  • trunk/psLib/src/sys/psTrace.h

    r4330 r4409  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-06-21 03:01:37 $
     11 *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-28 20:17:52 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    6060
    6161#ifdef DOXYGEN
    62 void psTrace(const char *facil,        ///< facilty of interest
    63              psS32 myLevel,            ///< desired trace level
    64              ...)                      ///< trace message arguments
    65 ;
     62void psTrace(
     63    const char *facil,                 ///< facilty of interest
     64    int level,                         ///< desired trace level
     65    ...                                ///< trace message arguments
     66);
     67
    6668#else
    6769/// Send a trace message
    68 void p_psTrace(const char *facil,      ///< facilty of interest
    69                psS32 myLevel,          ///< desired trace level
    70                ...)                    ///< trace message arguments
    71 ;
     70void p_psTrace(
     71    const char *facil,                 ///< facilty of interest
     72    psS32 myLevel,                     ///< desired trace level
     73    ...                                ///< trace message arguments
     74);
    7275
    7376#ifndef SWIG
     
    7881
    7982/// Set trace level
    80 psBool psTraceSetLevel(const char *facil,     ///< facilty of interest
    81                        psS32 level)     ///< desired trace level
    82 ;
     83psBool psTraceSetLevel(
     84    const char *facil,                 ///< facilty of interest
     85    int level                          ///< desired trace level
     86);
    8387
    8488/// Get the trace level
     
    9498
    9599/// Set the destination of future trace messages.
    96 void psTraceSetDestination(FILE * fp);
     100void psTraceSetDestination(
     101    FILE * fp                          ///<
     102);
    97103
    98104/// Get the current destination for trace messages.
Note: See TracChangeset for help on using the changeset viewer.