Changeset 541

Timestamp:

Apr 27, 2004, 4:51:39 PM (22 years ago)

Author:

desonia

Message:

misc changes.

Location:

trunk/psLib

Files:

• psLib.kdevses (modified) (1 diff)
• src/sys/psMemory.h (modified) (3 diffs)
• src/sysUtils/psMemory.h (modified) (3 diffs)
• test/Makefile (modified) (2 diffs)
• test/sysUtils/Makefile (modified) (3 diffs)

trunk/psLib/psLib.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="10" >
-  <Doc0 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/temp.c" >
-   <View0 line="0" Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="588" Left="1" MinMaxMode="0" />
+ <DocsAndViews NumberOfDocuments="7" >
+  <Doc0 NumberOfViews="1" URL="file:/home/desonia/psLib/test/tstMemory.c" >
+   <View0 line="22" Type="???" >
+    <AdditionalSettings Top="1" Width="1532" Attach="1" Height="943" Left="1" MinMaxMode="0" />
    </View0>
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:/home/desonia/psLib/test/temp.c" >
-   <View0 line="19" Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="559" Left="1" MinMaxMode="0" />
+  <Doc1 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psError.h" >
+   <View0 line="16" Type="???" >
+    <AdditionalSettings Top="1" Width="1532" Attach="1" Height="914" Left="1" MinMaxMode="0" />
    </View0>
   </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:/home/desonia/psLib/src/Makefile.Globals" >
-   <View0 line="0" Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="559" Left="1" MinMaxMode="0" />
+  <Doc2 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psError.c" >
+   <View0 line="72" Type="???" >
+    <AdditionalSettings Top="1" Width="1217" Attach="1" Height="599" Left="1" MinMaxMode="0" />
    </View0>
   </Doc2>
-  <Doc3 NumberOfViews="1" URL="file:/home/desonia/psLib/test/psTest.c" >
-   <View0 line="53" Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="559" Left="1" MinMaxMode="0" />
+  <Doc3 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psTrace.h" >
+   <View0 line="0" Type="???" >
+    <AdditionalSettings Top="1" Width="1217" Attach="1" Height="599" Left="1" MinMaxMode="0" />
    </View0>
   </Doc3>
-  <Doc4 context="" NumberOfViews="1" URL="man:/printf" >
-   <View0 Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="579" Left="1" MinMaxMode="0" />
+  <Doc4 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psLogMsg.h" >
+   <View0 line="16" Type="???" >
+    <AdditionalSettings Top="1" Width="1217" Attach="1" Height="599" Left="1" MinMaxMode="0" />
    </View0>
   </Doc4>
-  <Doc5 context="" NumberOfViews="1" URL="man:/usr/share/man/man3/printf.3.gz" >
-   <View0 Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="579" Left="1" MinMaxMode="0" />
+  <Doc5 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psLogMsg.c" >
+   <View0 line="318" Type="???" >
+    <AdditionalSettings Top="1" Width="1217" Attach="1" Height="599" Left="1" MinMaxMode="0" />
    </View0>
   </Doc5>
-  <Doc6 NumberOfViews="1" URL="file:/home/desonia/psLib/test/psTest.h" >
-   <View0 line="20" Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="559" Left="1" MinMaxMode="0" />
+  <Doc6 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psMemory.c" >
+   <View0 line="413" Type="???" >
+    <AdditionalSettings Top="1" Width="1426" Attach="1" Height="714" Left="1" MinMaxMode="0" />
    </View0>
   </Doc6>
-  <Doc7 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psMemory.h" >
-   <View0 line="171" Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="559" Left="1" MinMaxMode="0" />
-   </View0>
-  </Doc7>
-  <Doc8 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psString.c" >
-   <View0 line="0" Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="559" Left="1" MinMaxMode="0" />
-   </View0>
-  </Doc8>
-  <Doc9 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psString.h" >
-   <View0 line="0" Type="???" >
-    <AdditionalSettings Top="1" Width="1125" Attach="1" Height="559" Left="1" MinMaxMode="0" />
-   </View0>
-  </Doc9>
  </DocsAndViews>
  <pluginList>

trunk/psLib/src/sys/psMemory.h

@@ -12 +12 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-20 03:11:51 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-04-28 02:51:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -60 +60 @@
 
 /// Memory allocation. Underlying private function called by macro psAlloc.
-void *p_psAlloc(size_t size,  ///< Size required
+void* p_psAlloc(size_t size,  ///< Size required
                 const char *file, ///< File of call
                 int lineno)  ///< Line number of call
@@ -66 +66 @@
 
 /// Memory re-allocation.  Underlying private function called by macro psRealloc.
-void *p_psRealloc(void *ptr,  ///< Pointer to re-allocate
+void* p_psRealloc(void *ptr,  ///< Pointer to re-allocate
                   size_t size,  ///< Size required
                   const char *file, ///< File of call

trunk/psLib/src/sysUtils/psMemory.h

@@ -12 +12 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-20 03:11:51 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-04-28 02:51:39 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -60 +60 @@
 
 /// Memory allocation. Underlying private function called by macro psAlloc.
-void *p_psAlloc(size_t size,  ///< Size required
+void* p_psAlloc(size_t size,  ///< Size required
                 const char *file, ///< File of call
                 int lineno)  ///< Line number of call
@@ -66 +66 @@
 
 /// Memory re-allocation.  Underlying private function called by macro psRealloc.
-void *p_psRealloc(void *ptr,  ///< Pointer to re-allocate
+void* p_psRealloc(void *ptr,  ///< Pointer to re-allocate
                   size_t size,  ///< Size required
                   const char *file, ///< File of call

trunk/psLib/test/Makefile

@@ -3 +3 @@
 ##  Makefile:   test
 ##
-##  $Revision: 1.1 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-04-27 02:20:28 $
+##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-04-28 02:51:39 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 # Set CFLAGS used by the implicit rule to compile .c
 
-CFLAGS := $(CFLAGS_RELOC)
+CFLAGS := $(CFLAGS_RELOC) -I../include
 
 # Define the source objects

trunk/psLib/test/sysUtils/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-04-27 22:57:09 $
+##  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-04-28 02:51:39 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13 +13 @@
 
 PSLIB_INCL_DIR = ../../include
-
 PSLIB_LIB_DIR = ../../lib
 
 TARGET = tst_psError        \
+         tstMemory          \
          atst_psAbort_01    \
          atst_psAbort_02    \
@@ -35 +35 @@
 
 %.o : %.c
-        $(CC) $(CFLAGS) $(CPPFLAGS) -I$(PSLIB_INCL_DIR) -c -o $@ $< 
+        $(CC) $(CFLAGS) $(CPPFLAGS) -I.. -I$(PSLIB_INCL_DIR) -c -o $@ $<
 
 %   : %.o
-        $(CC) $(LDFLAGS) -L$(PSLIB_LIB_DIR) -lpslib -lpstest -o $@ $<
+        $(CC) $(LDFLAGS) -L$(PSLIB_LIB_DIR) -L.. -lpslib -lpstest -o $@ $<
 
 %.lint: %.c