IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4877


Ignore:
Timestamp:
Aug 25, 2005, 1:42:07 PM (21 years ago)
Author:
desonia
Message:

* empty log message *

Location:
trunk/psLib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/pslib.kdevelop

    r4600 r4877  
    4949        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
    5050      </envvars>
     51      <abortonerror>false</abortonerror>
     52      <numberofjobs>2</numberofjobs>
     53      <dontact>false</dontact>
     54      <makebin/>
     55      <prio>0</prio>
    5156    </make>
    5257  </kdevautoproject>

  • trunk/psLib/src/astro/psCoord.h

    r4620 r4877  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-07-27 19:55:15 $
     12*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-08-25 23:42:01 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    162162psCube* psCubeAlloc(void);
    163163
    164 /** Allocates a psCube
    165  *
    166  *  @return psCube*       resulting cube structure.
    167  */
    168 psCube* psCubeAlloc(void);
    169 
    170164/** Allocates a psPlaneTransform transform.
    171165 *

  • trunk/psLib/src/psErrorText.h.in

    r4540 r4877  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-07-12 19:12:00 $
     9 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-08-25 23:41:59 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1313 */
     14
     15/* !!! DO NOT EDIT psErrorText.h!  Add error messages to the cooresponding .dat file !!! */
    1416
    1517#ifndef PS_ERROR_TEXT_H

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

    r4589 r4877  
    88*  @author Robert Lupton, Princeton University
    99*
    10 *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-07-21 01:40:10 $
     10*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-08-25 23:42:07 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    109109        psError(PS_ERR_MEMORY_CORRUPTION, false,
    110110                PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
    111                 ptr->id, ptr->file, ptr->lineno, file, lineno);
     111                (unsigned long)ptr->id, ptr->file, ptr->lineno, file, lineno);
    112112    }
    113113
    … …  
    138138        psError(PS_ERR_MEMORY_CORRUPTION, true,
    139139                PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
    140                 m->id);
     140                (unsigned long)m->id);
    141141        return 1;
    142142    }
    … …  
    145145        psError(PS_ERR_MEMORY_CORRUPTION, true,
    146146                PS_ERRORTEXT_psMemory_UNDERFLOW,
    147                 m->id);
     147                (unsigned long)m->id);
    148148        return 1;
    149149    }
    … …  
    151151        psError(PS_ERR_MEMORY_CORRUPTION, true,
    152152                PS_ERRORTEXT_psMemory_OVERFLOW,
    153                 m->id);
     153                (unsigned long)m->id);
    154154        return 1;
    155155    }
    … …  
    390390        if (checkMemBlock(ptr, __func__) != 0) {
    391391            memProblemCallback(ptr, file, lineno);
    392             psAbort(file, "Realloc detected a memory corruption (id %lld @ %s:%d).",
    393                     ptr->id, ptr->file, ptr->lineno);
     392            psAbort(file, "Realloc detected a memory corruption (id %lu @ %s:%d).",
     393                    (unsigned long)ptr->id, ptr->file, ptr->lineno);
    394394        }
    395395
    … …  
    444444
    445445        psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
    446                 ptr->id, ptr->file, ptr->lineno, filename, lineno);
     446                (unsigned long)ptr->id, ptr->file, ptr->lineno, filename, lineno);
    447447    }
    448448
    … …  
    481481                }
    482482
    483                 fprintf(fd, "   %20s:%-4d %ld\n", iter->file, (int)iter->lineno, (long)iter->id);
     483                fprintf(fd, "   %20s:%-4d %lu\n", iter->file, (int)iter->lineno, (unsigned long)iter->id);
    484484            }
    485485        }

  • trunk/psLib/test/db/Makefile.am

    r4547 r4877  
    1717EXTRA_DIST = verified
    1818
    19 CLEANFILES = $(TESTS) $(check_DATA)
     19CLEANFILES = $(TESTS) $(check_DATA)
     20
     21clean-local:
     22        mysql test -e "drop table1" 2> /dev/null || \
     23        mysql test -e "drop table2" 2> /dev/null || \
     24        mysql test -e "drop table3" 2> /dev/null || \
     25        mysql test -e "drop table4" 2> /dev/null || \
     26        mysql test -e "drop table5" 2> /dev/null || \
     27        mysql test -e "drop table6" 2> /dev/null || \
     28        mysql test -e "drop table7" 2> /dev/null || \
     29        mysql test -e "drop table8" 2> /dev/null || \
     30        mysql test -e "drop table9" 2> /dev/null || \
     31        mysql test -e "drop table10" 2> /dev/null || \
     32        mysql test -e "drop table11" 2> /dev/null || \
     33        true
    2034
    2135tests: $(check_DATA) $(TESTS)

  • trunk/psLib/test/imageops/verified/tst_psImagePixelManip.stderr

    r4547 r4877  
    2727<DATE><TIME>|<HOST>|I|testImageClip
    2828    Following should be an error (max<min)
     29<DATE><TIME>|<HOST>|E|psImageClip (FILE:LINENO)
     30    Specified min value, 256, can not be greater than the specified max value, 128.
    2931
    3032---> TESTPOINT PASSED (psImage{psImageClip} | tst_psImagePixelManip.c)

  • trunk/psLib/test/sys/tst_psMemory.c

    r4547 r4877  
    66*  @author Robert DeSonia, MHPCC
    77*
    8 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    9 *  @date $Date: 2005-07-13 02:47:01 $
     8*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     9*  @date $Date: 2005-08-25 23:42:07 $
    1010*
    1111*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    491491void memProblemCallback( psMemBlock *ptr, const char *file, unsigned int lineno )
    492492{
    493     psLogMsg( __func__, PS_LOG_INFO, "memory callback called for id %lld (%s:%d).",
     493    psLogMsg( __func__, PS_LOG_INFO, "memory callback called for id %lu (%s:%d).",
    494494              ptr->id, file, lineno );
    495495    problemCallbackCalled++;
    … …  
    499499psMemId memAllocCallback( const psMemBlock *ptr )
    500500{
    501     psLogMsg( __func__, PS_LOG_INFO, "block %lld was (re)allocated", ptr->id );
     501    psLogMsg( __func__, PS_LOG_INFO, "block %lu was (re)allocated", ptr->id );
    502502    allocCallbackCalled++;
    503503    return 1;
    … …  
    506506psMemId memFreeCallback( const psMemBlock *ptr )
    507507{
    508     psLogMsg( __func__, PS_LOG_INFO, "block %lld was freed", ptr->id );
     508    psLogMsg( __func__, PS_LOG_INFO, "block %lu was freed", ptr->id );
    509509    freeCallbackCalled++;
    510510    return 1;
Note: See TracChangeset for help on using the changeset viewer.