IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 6, 2004, 2:06:06 PM (22 years ago)
Author:
desonia
Message:

another attempt to get astyle to get it right.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r1406 r1407  
     1
    12/** @file  psScalar.c
    23 *
    … …  
    89 *  @author Ross Harman, MHPCC
    910 *
    10  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2004-08-06 22:34:05 $
     11 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-08-07 00:06:06 $
    1213 *
    1314 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1516
    1617/******************************************************************************/
     18
    1719/*  INCLUDE FILES                                                             */
     20
    1821/******************************************************************************/
    1922#include "psMemory.h"
    … …  
    2427
    2528/******************************************************************************/
     29
    2630/*  DEFINE STATEMENTS                                                         */
     31
    2732/******************************************************************************/
    2833
    … …  
    3035
    3136/******************************************************************************/
     37
    3238/*  TYPE DEFINITIONS                                                          */
     39
    3340/******************************************************************************/
    3441
    … …  
    3643
    3744/*****************************************************************************/
     45
    3846/*  GLOBAL VARIABLES                                                         */
     47
    3948/*****************************************************************************/
    4049
    … …  
    4251
    4352/*****************************************************************************/
     53
    4454/*  FILE STATIC VARIABLES                                                    */
     55
    4556/*****************************************************************************/
    4657
    … …  
    4859
    4960/*****************************************************************************/
     61
    5062/*  FUNCTION IMPLEMENTATION - LOCAL                                          */
     63
    5164/*****************************************************************************/
    5265
    … …  
    5467
    5568/*****************************************************************************/
     69
    5670/* FUNCTION IMPLEMENTATION - PUBLIC                                          */
     71
    5772/*****************************************************************************/
    5873psScalar *psScalarAlloc(psC64 value, psElemType dataType)
    … …  
    6176
    6277    // Create scalar
    63     scalar = (psScalar *)psAlloc(sizeof(psScalar));
    64     if(scalar == NULL) {
    65         psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
     78    scalar = (psScalar *) psAlloc(sizeof(psScalar));
     79    if (scalar == NULL) {
     80        psAbort(__func__, " : Line %d - Failed to allocate memory", __LINE__);
    6681    }
    6782
    … …  
    7186    switch (dataType) {
    7287    case PS_TYPE_S8:
    73         scalar->data.S8 = (psS8)value;
     88        scalar->data.S8 = (psS8) value;
    7489        break;
    7590    case PS_TYPE_U8:
    76         scalar->data.U8 = (psU8)value;
     91        scalar->data.U8 = (psU8) value;
    7792        break;
    7893    case PS_TYPE_S16:
    79         scalar->data.S16 = (psS16)value;
     94        scalar->data.S16 = (psS16) value;
    8095        break;
    8196    case PS_TYPE_U16:
    82         scalar->data.U16 = (psU16)value;
     97        scalar->data.U16 = (psU16) value;
    8398        break;
    8499    case PS_TYPE_S32:
    85         scalar->data.S32 = (psS32)value;
     100        scalar->data.S32 = (psS32) value;
    86101        break;
    87102    case PS_TYPE_U32:
    88         scalar->data.U32 = (psU32)value;
     103        scalar->data.U32 = (psU32) value;
    89104        break;
    90105    case PS_TYPE_S64:
    91         scalar->data.S64 = (psS64)value;
     106        scalar->data.S64 = (psS64) value;
    92107        break;
    93108    case PS_TYPE_U64:
    94         scalar->data.U64 = (psU64)value;
     109        scalar->data.U64 = (psU64) value;
    95110        break;
    96111    case PS_TYPE_F32:
    97         scalar->data.F32 = (psF32)value;
     112        scalar->data.F32 = (psF32) value;
    98113        break;
    99114    case PS_TYPE_F64:
    100         scalar->data.F64 = (psF64)value;
     115        scalar->data.F64 = (psF64) value;
    101116        break;
    102117    case PS_TYPE_C32:
    103         scalar->data.C32 = (psC32)value;
     118        scalar->data.C32 = (psC32) value;
    104119        break;
    105120    case PS_TYPE_C64:
    106         scalar->data.C64 = (psC64)value;
     121        scalar->data.C64 = (psC64) value;
    107122        break;
    108123    default:
    … …  
    110125    }
    111126
    112 
    113127    return scalar;
    114128}
    115129
    116 void psScalarFree(psScalar *restrict scalar)
     130void psScalarFree(psScalar * restrict scalar)
    117131{
    118132    if (scalar == NULL) {
    … …  
    122136    psFree(scalar);
    123137}
    124 
    125 
Note: See TracChangeset for help on using the changeset viewer.