[svn-r29700] Merge of r29030, 29034, and 29035 from trunk

Cleanup of test/externals before merging HDFFV-8740 changes.

Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
           serial autotools w/ C++ & Fortran
           serial CMake
           parallel autotools w/ Fortran (MPICH 3.1.4)

src/H5private.h

@@ -1182,7 +1182,9 @@ typedef off_t               h5_stat_size_t;
 #ifndef HDsnprintf
     #define HDsnprintf    snprintf /*varargs*/
 #endif /* HDsnprintf */
-/* sprintf() variable arguments */
+#ifndef HDsprintf
+    #define HDsprintf    sprintf /*varargs*/
+#endif /* HDsprintf */
 #ifndef HDsqrt
     #define HDsqrt(X)    sqrt(X)
 #endif /* HDsqrt */

test/gen_udlinks.c

@@ -22,9 +22,6 @@
  *  They will be named according to the platform and should
  *  be placed in the hdf5/test directory so that the links test can use them.
  *
- * Note: The be_extlink2.h5 is also used by external.c to test opening
- *  external link twice. -SLU 2007/11/7
- *
  */
 
 #include "hdf5.h"

test/links.c

@@ -7300,7 +7300,7 @@ error:
     } H5E_END_TRY
 
     return -1;
-} /* end efc_open_twice */
+} /* end external_open_twice() */
 
 
 /*-------------------------------------------------------------------------