Changeset 4877 for trunk/psLib/src

Timestamp:

Aug 25, 2005, 1:42:07 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src

Files:

• astro/psCoord.h (modified) (2 diffs)
• psErrorText.h.in (modified) (1 diff)
• sys/psMemory.c (modified) (8 diffs)

trunk/psLib/src/astro/psCoord.h

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-27 19:55:15 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-25 23:42:01 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -162 +162 @@
 psCube* psCubeAlloc(void);
 
-/** Allocates a psCube
- *
- *  @return psCube*       resulting cube structure.
- */
-psCube* psCubeAlloc(void);
-
 /** Allocates a psPlaneTransform transform.
  *

trunk/psLib/src/psErrorText.h.in

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

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-21 01:40:10 $
+*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-25 23:42:07 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -109 +109 @@
         psError(PS_ERR_MEMORY_CORRUPTION, false,
                 PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
-                ptr->id, ptr->file, ptr->lineno, file, lineno);
+                (unsigned long)ptr->id, ptr->file, ptr->lineno, file, lineno);
     }
 
@@ -138 +138 @@
         psError(PS_ERR_MEMORY_CORRUPTION, true,
                 PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
-                m->id);
+                (unsigned long)m->id);
         return 1;
     }
@@ -145 +145 @@
         psError(PS_ERR_MEMORY_CORRUPTION, true,
                 PS_ERRORTEXT_psMemory_UNDERFLOW,
-                m->id);
+                (unsigned long)m->id);
         return 1;
     }
@@ -151 +151 @@
         psError(PS_ERR_MEMORY_CORRUPTION, true,
                 PS_ERRORTEXT_psMemory_OVERFLOW,
-                m->id);
+                (unsigned long)m->id);
         return 1;
     }
@@ -390 +390 @@
         if (checkMemBlock(ptr, __func__) != 0) {
             memProblemCallback(ptr, file, lineno);
-            psAbort(file, "Realloc detected a memory corruption (id %lld @ %s:%d).",
-                    ptr->id, ptr->file, ptr->lineno);
+            psAbort(file, "Realloc detected a memory corruption (id %lu @ %s:%d).",
+                    (unsigned long)ptr->id, ptr->file, ptr->lineno);
         }
 
@@ -444 +444 @@
 
         psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
-                ptr->id, ptr->file, ptr->lineno, filename, lineno);
+                (unsigned long)ptr->id, ptr->file, ptr->lineno, filename, lineno);
     }
 
@@ -481 +481 @@
                 }
 
-                fprintf(fd, "   %20s:%-4d %ld\n", iter->file, (int)iter->lineno, (long)iter->id);
+                fprintf(fd, "   %20s:%-4d %lu\n", iter->file, (int)iter->lineno, (unsigned long)iter->id);
             }
         }