IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 511


Ignore:
Timestamp:
Apr 23, 2004, 11:33:59 AM (22 years ago)
Author:
harman
Message:

Changed p_XX allocations to psXX allocations

Location:
trunk/psLib/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r502 r511  
    88 *  @author Ross Harman, MHPCC
    99 *   
    10  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2004-04-22 21:15:01 $
     10 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2004-04-23 21:33:59 $
    1212 *
    1313 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8282typedef struct
    8383{
    84     psType type;    ///< Type of data. THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     84    psType type;    ///< Type of data.
    8585    int nalloc;     ///< Total number of elements available.
    8686    int n;          ///< Number of elements in use.

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

    r438 r511  
    99 *  @author Ross Harman, MHPCC
    1010 *   
    11  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-04-17 02:43:59 $
     11 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-04-23 21:33:59 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2424
    2525#include "psBitMask.h"
    26 //#include "psMemory.h"
     26#include "psMemory.h"
    2727
    2828/*****************************************************************************/
    … …  
    3535    index = bit/8;
    3636    byte = inMask->bits+index;
    37    
     37
    3838    return byte;
    3939}
    … …  
    4343    char mask = 0x01;
    4444    mask = mask << (bit%8);
    45    
     45
    4646    return mask;
    4747}
    … …  
    5252psBitMask* psBitMaskAlloc(int n)
    5353{
    54 //    psBitMask *newObj = (psBitMask*)psAlloc(sizeof(psBitMask));
    55     psBitMask *newObj = (psBitMask*)malloc(sizeof(psBitMask));
     54    psBitMask *newObj = psAlloc(sizeof(psBitMask));
    5655    newObj->n = n;
    57     newObj->bits = (char*)malloc(sizeof(char)*n);
     56    newObj->bits = psAlloc(sizeof(char)*n);
    5857    memset(newObj->bits, n, 0);
    59    
     58
    6059    return newObj;
    6160}
    … …  
    7170    char* byte = getByte(bit, inMask);
    7271    *byte |= mask(bit);
    73    
     72
    7473    return inMask;
    7574}
    … …  
    8180        return 0;
    8281    }
    83    
     82
    8483    return 1;
    8584}
    8685
    87 psBitMask* psBitMaskOp(psBitMask *outMask, const psBitMask *restrict inMask1, char *operator, 
     86psBitMask* psBitMaskOp(psBitMask *outMask, const psBitMask *restrict inMask1, char *operator,
    8887                       const psBitMask *restrict inMask2)
    8988{
    … …  
    9998        return outMask;
    10099    }
    101    
     100
    102101    if(inMask1 == NULL) {
    103102        printf("Null input psBitMask1\n");
    104103        return outMask;
    105104    }
    106    
     105
    107106    if(operator == NULL) {
    108107        printf("Null input operator\n");
    … …  
    110109
    111110    }
    112  
     111
    113112    if(inMask2 == NULL) {
    114113        printf("Null input psBitMask2\n");
    115114        return outMask;
    116115    }
    117    
     116
    118117    if(inMask1->n != inMask2->n || outMask->n != inMask1->n) {
    119118        printf("Mask sizes not the same\n");
    120119        return outMask;
    121120    }
    122    
     121
    123122    n = outMask->n;
    124123    outBits = outMask->bits;
    125124    inBits1 = inMask1->bits;
    126125    inBits2 = inMask2->bits;
    127    
     126
    128127    tempChar = toupper(*operator);
    129128    switch(tempChar) {
    … …  
    146145        printf("Invalid psBitMask option %s\n", operator);
    147146    }
    148    
     147
    149148    return outMask;
    150149}
    … …  
    158157        outString[numBits-i-1] = (psBitMaskTest(inMask, i))?'1':'0';
    159158    }
    160    
     159
    161160    return outString;
    162161}

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

    r502 r511  
    88 *  @author Ross Harman, MHPCC
    99 *   
    10  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2004-04-22 21:15:01 $
     10 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2004-04-23 21:33:59 $
    1212 *
    1313 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8282typedef struct
    8383{
    84     psType type;    ///< Type of data. THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     84    psType type;    ///< Type of data.
    8585    int nalloc;     ///< Total number of elements available.
    8686    int n;          ///< Number of elements in use.
Note: See TracChangeset for help on using the changeset viewer.