Changeset 37092

Timestamp:

Jul 20, 2014, 10:07:19 AM (12 years ago)

Author:

eugene

Message:

add_*_link returns int instead of off_t

Location:

branches/eam_branches/ipp-20140717/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/build_links.c (modified) (6 diffs)

branches/eam_branches/ipp-20140717/Ohana/src/addstar/include/addstar.h

@@ -255 +255 @@
 off_t     *init_lensing_links     PROTO((Average *average, off_t Naverage, Lensing *lensing, off_t Nlensing));
 off_t     *init_missing_links     PROTO((Average *average, off_t Naverage, Missing *missing, off_t Nmissing));
-off_t      add_meas_link          PROTO((Average *average, off_t *next_meas, off_t Nmeasure, off_t NMEASURE));
-off_t      add_miss_link          PROTO((Average *average, off_t *next_miss, off_t Nmissing));
-off_t      add_lens_link          PROTO((Average *average, off_t *next_lens, off_t Nlensing, off_t NLENSING));
+int        add_meas_link          PROTO((Average *average, off_t *next_meas, off_t Nmeasure, off_t NMEASURE));
+int        add_miss_link          PROTO((Average *average, off_t *next_miss, off_t Nmissing));
+int        add_lens_link          PROTO((Average *average, off_t *next_lens, off_t Nlensing, off_t NLENSING));
 off_t     *build_measure_links    PROTO((Average *average, off_t Naverage, Measure *measure, off_t Nmeasure));
 off_t     *build_lensing_links    PROTO((Average *average, off_t Naverage, Lensing *lensing, off_t Nlensing));

branches/eam_branches/ipp-20140717/Ohana/src/addstar/src/build_links.c

@@ -102 +102 @@
 
 /* average[].measureOffset, average[].Nmeasure are valid within an addstar run */
-off_t add_meas_link (Average *average, off_t *next_meas, off_t Nmeasure, off_t NMEASURE) {
+int add_meas_link (Average *average, off_t *next_meas, off_t Nmeasure, off_t NMEASURE) {
 
   off_t k, m;
@@ -133 +133 @@
   return (TRUE);
 }
-
-/* Missing does not carry enough information to reconstruct the links
-   we must always save the missing table, if it exists */
 
 Measure *sort_measure (Average *average, off_t Naverage, Measure *measure, off_t Nmeasure, off_t *next_meas) {
@@ -160 +157 @@
 }
 
+/*******************************************************************************************/
+
 /* build the initial links assuming the table is sorted */
 off_t *init_missing_links (Average *average, off_t Naverage, Missing *missing, off_t Nmissing) {
@@ -186 +185 @@
 }
 
-off_t add_miss_link (Average *average, off_t *next_miss, off_t Nmissing) {
+int add_miss_link (Average *average, off_t *next_miss, off_t Nmissing) {
 
   off_t k, m;
@@ -205 +204 @@
 }
 
+/* Missing does not carry enough information to reconstruct the links
+   we must always save the missing table, if it exists */
+
 Missing *sort_missing (Average *average, off_t Naverage, Missing *missing, off_t Nmissing, off_t *next_miss) {
 
@@ -307 +309 @@
 
 /* average[].lensingOffset, average[].Nlensing are valid within an addstar run */
-off_t add_lens_link (Average *average, off_t *next_lens, off_t Nlensing, off_t NLENSING) {
+int add_lens_link (Average *average, off_t *next_lens, off_t Nlensing, off_t NLENSING) {
 
   off_t k, m;