Changeset 11710

Timestamp:

Feb 8, 2007, 11:57:02 AM (19 years ago)

Author:

jhoblitt

Message:

change psLookupTableAlloc() to pass in file/lineno/func
whitespace fixes

Location:

trunk/psLib/src/types

Files:

• psLookupTable.c (modified) (5 diffs)
• psLookupTable.h (modified) (11 diffs)

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-07 01:15:50 $
+*  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-08 21:57:02 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -285 +285 @@
 
 
-psLookupTable* psLookupTableAlloc(const char *filename,
-                                  const char *format,
-                                  long indexCol)
+psLookupTable* p_psLookupTableAlloc(const char *file,
+                                    unsigned int lineno,
+                                    const char *func,
+                                    const char *filename,
+                                    const char *format,
+                                    long indexCol)
 {
     // Can't read table if you don't know its name
@@ -298 +301 @@
 
     // Allocate lookup table
-    outTable = (psLookupTable*)psAlloc(sizeof(psLookupTable));
+    outTable = (psLookupTable*)p_psAlloc(file, lineno, func, sizeof(psLookupTable));
 
     // Set deallocator
@@ -608 +611 @@
 }
 
-psLookupTable *psLookupTableImport(psLookupTable *table,
-                                   const psArray *vectors,
-                                   long indexCol)
+psLookupTable *p_psLookupTableImport(const char *file,
+                                     unsigned int lineno,
+                                     const char *func,
+                                     psLookupTable *table,
+                                     const psArray *vectors,
+                                     long indexCol)
 {
     psLookupTable* outputTable = NULL;
@@ -618 +624 @@
 
     // Check for NULL input table
+    // XXX table/outputtable should be allocated if NULL
     PS_ASSERT_PTR_NON_NULL(table,NULL);
 

trunk/psLib/src/types/psLookupTable.h

@@ -6 +6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-23 22:47:23 $
+*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-08 21:57:02 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -53 +53 @@
 } psLookupStatusType;
 
+
 /** Lookup table parse status and error conditions
  *
@@ -64 +65 @@
 }psParseErrorType;
 
+
 /** Checks the type of a particular pointer.
  *
- *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
+ *  Uses the appropriate deallocation function in psMemBlock to check the ptr
+ *  datatype.
  *
- *  @return bool:       True if the pointer matches a psLookupTable structure, false otherwise.
+ *  @return bool:       True if the pointer matches a psLookupTable structure,
+ *  false otherwise.
  */
 bool psMemCheckLookupTable(
@@ -81 +85 @@
  *  @return psLookupTable*     New psLookupTable struct.
  */
+#ifdef DOXYGEN
 psLookupTable* psLookupTableAlloc(
     const char *filename,              ///< Name of file to read
@@ -86 +91 @@
     long indexCol                      ///< Column of the index vector (starting at zero)
 );
+#else // ifdef DOXYGEN
+psLookupTable* p_psLookupTableAlloc(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    const char *filename,              ///< Name of file to read
+    const char *format,                ///< scanf-like format string
+    long indexCol                      ///< Column of the index vector (starting at zero)
+);
+#define psLookupTableAlloc(filename, format, indexCol) \
+      p_psLookupTableAlloc(__FILE__, __LINE__, __func__, filename, format, indexCol)
+#endif // ifdef DOXYGEN
+
 
 /** Read vectors from file
@@ -98 +116 @@
 );
 
+
 /** Import arrays of vectors into a table
  *
@@ -104 +123 @@
  *  @return psLookupTable*  Lookup table structure with array vector data
  */
+#ifdef DOXYGEN
 psLookupTable *psLookupTableImport(
     psLookupTable *table,              ///< Lookup table into which to import
@@ -109 +129 @@
     long indexCol                      ///< Index of the index vector in the array of vectors
 );
+#else // ifdef DOXYGEN
+psLookupTable *p_psLookupTableImport(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    psLookupTable *table,               ///< Lookup table into which to import
+    const psArray *vectors,             ///< Array of vectors
+    long indexCol                       ///< Index of the index vector in the array of vectors
+);
+#define psLookupTableImport(table, vectors, indexCol) \
+      p_psLookupTableImport(__FILE__, __LINE__, __func__, table, vectors, indexCol)
+#endif // ifdef DOXYGEN
+
 
 /** Read lookup table
@@ -120 +153 @@
 );
 
+
 /** Lookup and interpolate value from table.
  *
- *  Interpolates value from table. Sets status bit for success or one of several possible failure
- *  conditions.
+ *  Interpolates value from table. Sets status bit for success or one of
+ *  several possible failure conditions.
  *
  *  @return double     Interpolation value at index
@@ -133 +167 @@
 );
 
+
 /** Lookup and interpolate all values from table.
  *
- *  Interpolates all values from table. Sets status bit for success or one of several possible failure
- *  conditions.
+ *  Interpolates all values from table. Sets status bit for success or one of
+ *  several possible failure conditions.
  *
  *  @return psVector*     Interpolation values calculated at index
@@ -145 +180 @@
 );
 
+
 /// @}
 #endif // #ifndef PS_LOOKUPTABLE_H