Remove dead code hidden behind #ifdef LATER (#2686)

12 files changed, 4 insertions, 300 deletions

diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
index ca16360..0fb4b32 100644
--- a/src/H5FLprivate.h
+++ b/src/H5FLprivate.h
@@ -24,9 +24,6 @@
 #define H5FLprivate_H
 
 /* Public headers needed by this file */
-#ifdef LATER
-#include "H5FLpublic.h" /*API prototypes			     */
-#endif                  /* LATER */
 
 /* Private headers needed by this file */
 
diff --git a/src/H5FOprivate.h b/src/H5FOprivate.h
index 9db0b0d..1f44ec8 100644
--- a/src/H5FOprivate.h
+++ b/src/H5FOprivate.h
@@ -16,10 +16,6 @@
 #ifndef H5FOprivate_H
 #define H5FOprivate_H
 
-#ifdef LATER
-#include "H5FOpublic.h"
-#endif /* LATER */
-
 /* Private headers needed by this file */
 #include "H5private.h"   /* Generic Functions			*/
 #include "H5Fprivate.h"  /* File access				*/
diff --git a/src/H5RSprivate.h b/src/H5RSprivate.h
index 0c8f3ea..a382140 100644
--- a/src/H5RSprivate.h
+++ b/src/H5RSprivate.h
@@ -19,9 +19,6 @@
 /**************************************/
 /* Public headers needed by this file */
 /**************************************/
-#ifdef LATER
-#include "H5RSpublic.h"
-#endif /* LATER */
 
 /***************************************/
 /* Private headers needed by this file */
diff --git a/src/H5SLprivate.h b/src/H5SLprivate.h
index 6bd1b79..d7eb5be 100644
--- a/src/H5SLprivate.h
+++ b/src/H5SLprivate.h
@@ -19,9 +19,6 @@
 /**************************************/
 /* Public headers needed by this file */
 /**************************************/
-#ifdef LATER
-#include "H5SLpublic.h"
-#endif /* LATER */
 
 /***************************************/
 /* Private headers needed by this file */
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index c2fb7fa..9d13cf2 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -49,12 +49,6 @@
 /* Local Prototypes */
 /********************/
 
-#ifdef LATER
-static herr_t H5S__select_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end);
-static htri_t H5S__select_iter_has_next_block(const H5S_sel_iter_t *iter);
-static herr_t H5S__select_iter_next_block(H5S_sel_iter_t *iter);
-#endif /* LATER */
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
@@ -1191,50 +1185,6 @@ H5S_select_iter_coords(const H5S_sel_iter_t *sel_iter, hsize_t *coords)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_select_iter_coords() */
 
-#ifdef LATER
-
-/*--------------------------------------------------------------------------
- NAME
-    H5S__select_iter_block
- PURPOSE
-    Get the block of the current iterator position
- USAGE
-    herr_t H5S__select_iter_block(sel_iter,start,end)
-        const H5S_sel_iter_t *sel_iter; IN: Selection iterator to query
-        hsize_t *start;    OUT: Array to place iterator start block coordinates
-        hsize_t *end;      OUT: Array to place iterator end block coordinates
- RETURNS
-    Non-negative on success, negative on failure.
- DESCRIPTION
-    The current location of the iterator within the selection is placed in
-    the COORDS array.
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
-    This routine participates in the "Inlining C function pointers"
-        pattern, don't call it directly, use the appropriate macro
-        defined in H5Sprivate.h.
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-static herr_t
-H5S__select_iter_block(const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
-{
-    herr_t ret_value; /* return value */
-
-    FUNC_ENTER_PACKAGE_NOERR
-
-    /* Check args */
-    HDassert(iter);
-    HDassert(start);
-    HDassert(end);
-
-    /* Call iter_block routine for selection type */
-    ret_value = (*iter->type->iter_block)(iter, start, end);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5S__select_iter_block() */
-#endif /* LATER */
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_nelmts
@@ -1271,46 +1221,6 @@ H5S_select_iter_nelmts(const H5S_sel_iter_t *sel_iter)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_select_iter_nelmts() */
 
-#ifdef LATER
-
-/*--------------------------------------------------------------------------
- NAME
-    H5S__select_iter_has_next_block
- PURPOSE
-    Check if there is another block available in the selection iterator
- USAGE
-    htri_t H5S__select_iter_has_next_block(sel_iter)
-        const H5S_sel_iter_t *sel_iter; IN: Selection iterator to query
- RETURNS
-    Non-negative on success, negative on failure.
- DESCRIPTION
-    Check if there is another block available to advance to in the selection
-    iterator.
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
-    This routine participates in the "Inlining C function pointers"
-        pattern, don't call it directly, use the appropriate macro
-        defined in H5Sprivate.h.
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-static htri_t
-H5S__select_iter_has_next_block(const H5S_sel_iter_t *iter)
-{
-    herr_t ret_value; /* return value */
-
-    FUNC_ENTER_PACKAGE_NOERR
-
-    /* Check args */
-    HDassert(iter);
-
-    /* Call iter_has_next_block routine for selection type */
-    ret_value = (*iter->type->iter_has_next_block)(iter);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5S__select_iter_has_next_block() */
-#endif /* LATER */
-
 /*--------------------------------------------------------------------------
  NAME
     H5S_select_iter_next
@@ -1353,48 +1263,6 @@ H5S_select_iter_next(H5S_sel_iter_t *iter, size_t nelem)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_select_iter_next() */
 
-#ifdef LATER
-
-/*--------------------------------------------------------------------------
- NAME
-    H5S__select_iter_next_block
- PURPOSE
-    Advance selection iterator to next block
- USAGE
-    herr_t H5S__select_iter_next_block(iter)
-        H5S_sel_iter_t *iter;   IN/OUT: Selection iterator to change
- RETURNS
-    Non-negative on success, negative on failure.
- DESCRIPTION
-    Move the current element for the selection iterator to the next
-    block in the selection.
- GLOBAL VARIABLES
- COMMENTS, BUGS, ASSUMPTIONS
-    Doesn't maintain the 'elmt_left' field of the selection iterator.
-
-    This routine participates in the "Inlining C function pointers"
-        pattern, don't call it directly, use the appropriate macro
-        defined in H5Sprivate.h.
- EXAMPLES
- REVISION LOG
---------------------------------------------------------------------------*/
-static herr_t
-H5S__select_iter_next_block(H5S_sel_iter_t *iter)
-{
-    herr_t ret_value; /* return value */
-
-    FUNC_ENTER_PACKAGE_NOERR
-
-    /* Check args */
-    HDassert(iter);
-
-    /* Call iter_next_block routine for selection type */
-    ret_value = (*iter->type->iter_next_block)(iter);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5S__select_iter_next_block() */
-#endif /* LATER */
-
 /*-------------------------------------------------------------------------
  * Function:	H5S_select_iter_get_seq_list
  *
diff --git a/src/H5UCprivate.h b/src/H5UCprivate.h
index 9a4aa2a..c6a6b7a 100644
--- a/src/H5UCprivate.h
+++ b/src/H5UCprivate.h
@@ -22,9 +22,6 @@
 /**************************************/
 /* Public headers needed by this file */
 /**************************************/
-#ifdef LATER
-#include "H5UCpublic.h"
-#endif /* LATER */
 
 /***************************************/
 /* Private headers needed by this file */
diff --git a/src/H5VM.c b/src/H5VM.c
index 3abe1d3..f67917d 100644
--- a/src/H5VM.c
+++ b/src/H5VM.c
@@ -35,11 +35,6 @@ static void H5VM__stride_optimize1(unsigned *np /*in,out*/, hsize_t *elmt_size /
                                    const hsize_t *size, hsize_t *stride1);
 static void H5VM__stride_optimize2(unsigned *np /*in,out*/, hsize_t *elmt_size /*in,out*/,
                                    const hsize_t *size, hsize_t *stride1, hsize_t *stride2);
-#ifdef LATER
-static void H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size, unsigned dst_n, const hsize_t *dst_size,
-                               const ssize_t *dst_stride, void *_dst, unsigned src_n, const hsize_t *src_size,
-                               const ssize_t *src_stride, const void *_src);
-#endif /* LATER */
 
 /*-------------------------------------------------------------------------
  * Function:    H5VM__stride_optimize1
@@ -761,76 +756,6 @@ H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size, const hss
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-#ifdef LATER
-
-/*-------------------------------------------------------------------------
- * Function:    H5VM__stride_copy2
- *
- * Purpose:     Similar to H5VM_stride_copy() except the source and
- *              destination each have their own dimensionality and size and
- *              we copy exactly NELMTS elements each of size ELMT_SIZE.	 The
- *              size counters wrap if NELMTS is more than a size counter.
- *
- * Return:      void
- *
- * Programmer:  Robb Matzke
- *              Saturday, October 11, 1997
- *
- *-------------------------------------------------------------------------
- */
-static void
-H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size, unsigned dst_n, const hsize_t *dst_size,
-                   const hsize_t *dst_stride, void *_dst, unsigned src_n, const hsize_t *src_size,
-                   const hsize_t *src_stride, const void *_src)
-{
-    uint8_t       *dst = (uint8_t *)_dst;
-    const uint8_t *src = (const uint8_t *)_src;
-    hsize_t        dst_idx[H5VM_HYPER_NDIMS];
-    hsize_t        src_idx[H5VM_HYPER_NDIMS];
-    hsize_t        i; /* Local index variable */
-    int            j; /* Local index variable */
-    hbool_t        carry;
-
-    FUNC_ENTER_PACKAGE_NOERR
-
-    HDassert(elmt_size < SIZE_MAX);
-    HDassert(dst_n > 0);
-    HDassert(src_n > 0);
-
-    H5VM_vector_cpy(dst_n, dst_idx, dst_size);
-    H5VM_vector_cpy(src_n, src_idx, src_size);
-
-    for (i = 0; i < nelmts; i++) {
-
-        /* Copy an element */
-        H5_CHECK_OVERFLOW(elmt_size, hsize_t, size_t);
-        H5MM_memcpy(dst, src, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */
-
-        /* Decrement indices and advance pointers */
-        for (j = (int)(dst_n - 1), carry = TRUE; j >= 0 && carry; --j) {
-            dst += dst_stride[j];
-            if (--dst_idx[j])
-                carry = FALSE;
-            else {
-                HDassert(dst_size);
-                dst_idx[j] = dst_size[j];
-            } /* end else */
-        }
-        for (j = (int)(src_n - 1), carry = TRUE; j >= 0 && carry; --j) {
-            src += src_stride[j];
-            if (--src_idx[j])
-                carry = FALSE;
-            else {
-                HDassert(src_size);
-                src_idx[j] = src_size[j];
-            } /* end else */
-        }
-    }
-
-    FUNC_LEAVE_NOAPI_VOID
-}
-#endif /* LATER */
-
 /*-------------------------------------------------------------------------
  * Function:    H5VM_array_fill
  *
diff --git a/test/tattr.c b/test/tattr.c
index 35b42dd..a4ff088 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -5503,13 +5503,9 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
     hsize_t  corder_count;            /* # of records in creation order index */
     unsigned reopen_file;             /* Whether to re-open the file before deleting group */
     char     attrname[NAME_BUF_SIZE]; /* Name of attribute */
-#ifdef LATER
-    h5_stat_size_t empty_size; /* Size of empty file */
-    h5_stat_size_t file_size;  /* Size of file after operating on it */
-#endif                         /* LATER */
-    unsigned curr_dset;        /* Current dataset to work on */
-    unsigned u;                /* Local index variable */
-    herr_t   ret;              /* Generic return value        */
+    unsigned curr_dset;               /* Current dataset to work on */
+    unsigned u;                       /* Local index variable */
+    herr_t   ret;                     /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Deleting Object w/Dense Attribute Storage and Creation Order Info\n"));
@@ -5536,24 +5532,6 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
     ret = H5Pget_attr_phase_change(dcpl, &max_compact, &min_dense);
     CHECK(ret, FAIL, "H5Pget_attr_phase_change");
 
-/* XXX: Try to find a way to resize dataset's object header so that the object
- *      header can have one chunk, then retrieve "empty" file size and check
- *      that size after everything is deleted -QAK
- */
-#ifdef LATER
-    /* Create empty file */
-    fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl, fapl);
-    CHECK(fid, FAIL, "H5Fcreate");
-
-    /* Close file */
-    ret = H5Fclose(fid);
-    CHECK(ret, FAIL, "H5Fclose");
-
-    /* Get the size of an empty file */
-    empty_size = h5_get_file_size(FILENAME);
-    CHECK(empty_size, FAIL, "h5_get_file_size");
-#endif /* LATER */
-
     /* Loop to leave file open when deleting dataset, or to close & re-open file
      *  before deleting dataset */
     for (reopen_file = FALSE; reopen_file <= TRUE; reopen_file++) {
@@ -5666,13 +5644,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Fclose");
         } /* end if */
 
-#ifdef LATER
-        /* Get the size of the file now */
-        file_size = h5_get_file_size(FILENAME);
-        CHECK(file_size, FAIL, "h5_get_file_size");
-        VERIFY(file_size, empty_size, "h5_get_file_size");
-#endif /* LATER */
-    }  /* end for */
+    } /* end for */
 
     /* Close property list */
     ret = H5Pclose(dcpl);
diff --git a/test/tfile.c b/test/tfile.c
index 03ade92..bca3da2 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -331,12 +331,6 @@ test_file_create(void)
     ret = H5Pclose(tmpl1);
     CHECK(ret, FAIL, "H5Pclose");
 
-#ifdef LATER
-    /* Double-check that the atom has been vaporized */
-    ret = H5Pclose(tmpl1);
-    VERIFY(ret, FAIL, "H5Pclose");
-#endif
-
     if (h5_using_default_driver(NULL)) {
 
         /* Create a new file with a non-standard file-creation template */
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 5002fb8..34c4d97 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -3427,9 +3427,6 @@ actual_io_mode_tests(void)
  * Programmer: Jonathan Kim
  * Date: Aug, 2012
  */
-#ifdef LATER
-#define DSET_NOCOLCAUSE "nocolcause"
-#endif
 #define FILE_EXTERNAL "nocolcause_extern.data"
 static void
 test_no_collective_cause_mode(int selection_mode)
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index d9e26e7..223eb61 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -1336,22 +1336,6 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     if (i)
                         h5tools_str_append(str, "%s", OPT(info->vlen_sep, "," OPTIONAL_LINE_BREAK));
 
-#ifdef LATER
-                    /* Need to fix so VL data breaks at correct location on end of line -QAK */
-                    if (info->arr_linebreak && h5tools_str_len(str) >= info->line_ncols) {
-                        int x;
-
-                        h5tools_str_append(str, "%s", "\n");
-
-                        /* need to indent some more here */
-                        if (ctx->indent_level >= 0)
-                            h5tools_str_append(str, "%s", OPT(info->line_pre, ""));
-
-                        for (x = 0; x < ctx->indent_level + 1; x++)
-                            h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
-                    } /* end if */
-#endif                /* LATER */
-
                     ctx->indent_level++;
 
                     /* Dump the array element */
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 1265c30..19b29ba 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -192,26 +192,6 @@ compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceL
     }
 }
 
-#ifdef LATER
-/*
- * Function:    uncompress_buffer
- * Purpose:     Uncompress the buffer.
- * Returns:     Z_OK            - success
- *              Z_MEM_ERROR     - not enough memory
- *              Z_BUF_ERROR     - not enough room in the output buffer
- *              Z_DATA_ERROR    - the input data was corrupted
- * Programmer:  Bill Wendling, 05. June 2002
- * Modifications:
- */
-static int
-uncompress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen)
-{
-    int rc = uncompress(dest, destLen, source, sourceLen);
-
-    return rc;
-}
-#endif /* LATER */
-
 /*
  * Function:    get_unique_name
  * Purpose:     Create a new file who's name doesn't conflict with