summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/gnu-flags2
-rw-r--r--fortran/src/H5_f.c10
-rw-r--r--fortran/src/H5match_types.c16
-rw-r--r--hl/fortran/src/H5IMcc.c10
-rwxr-xr-xhl/fortran/src/H5LTfc.c4
-rw-r--r--hl/src/H5LT.c4
-rw-r--r--hl/src/H5LTparse.c2
-rw-r--r--hl/src/H5LTpublic.h4
-rw-r--r--perform/pio_engine.c34
-rw-r--r--perform/pio_perf.c60
-rw-r--r--perform/pio_standalone.h19
-rw-r--r--perform/sio_engine.c6
-rw-r--r--perform/sio_perf.c12
-rw-r--r--perform/sio_standalone.h18
-rw-r--r--src/H5EA.c24
-rw-r--r--src/H5EAdbg.c6
-rw-r--r--src/H5EAdblkpage.c4
-rw-r--r--src/H5EAdblock.c6
-rw-r--r--src/H5EAiblock.c6
-rw-r--r--src/H5EAsblock.c6
-rw-r--r--src/H5EAtest.c4
-rw-r--r--src/H5FDmulti.c6
-rw-r--r--src/H5Ocopy.c2
-rw-r--r--src/H5Oshared.c2
-rw-r--r--src/H5T.c4
-rw-r--r--src/H5Tconv.c180
-rw-r--r--src/H5Tnative.c8
-rw-r--r--src/H5Tpublic.h2
-rw-r--r--src/H5Zscaleoffset.c126
-rw-r--r--src/H5Ztrans.c12
-rw-r--r--src/H5detect.c4
-rw-r--r--src/H5private.h8
-rw-r--r--src/H5public.h32
-rw-r--r--test/big.c8
-rw-r--r--test/cmpd_dset.c2
-rw-r--r--test/dsets.c62
-rw-r--r--test/dt_arith.c222
-rw-r--r--test/dtransform.c8
-rw-r--r--test/earray.c4
-rw-r--r--test/ntypes.c12
-rw-r--r--test/tconfig.c2
-rw-r--r--tools/h5diff/h5diffgentest.c18
-rw-r--r--tools/h5dump/h5dump.c28
-rw-r--r--tools/h5dump/h5dumpgentest.c2
-rwxr-xr-xtools/h5import/h5import.h2
-rwxr-xr-xtools/h5import/h5importtest.c8
-rw-r--r--tools/h5ls/h5ls.c12
-rw-r--r--tools/h5repack/h5repacktst.c2
-rw-r--r--tools/lib/h5diff_array.c114
-rw-r--r--tools/lib/h5diff_util.c2
-rw-r--r--tools/lib/h5tools.c12
-rw-r--r--tools/lib/h5tools_str.c12
52 files changed, 560 insertions, 615 deletions
diff --git a/config/gnu-flags b/config/gnu-flags
index 5fd72f2..de73810 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -151,7 +151,7 @@ case "$cc_vendor-$cc_version" in
# optimization levels (which shows up as failures for various integer
# types -> long long conversions in the test/dtypes test). Perhaps
# later versions of gcc will fix this bug... - QAK - 2003/10/20
- PROD_CFLAGS="-O"
+ PROD_CFLAGS="-O0"
;;
gcc-4*)
# Be optimistic about future versions of gcc.. :-) - QAK - 2003/10/20
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 915f8cb..d7bb3d8 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -56,7 +56,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
if ((types[0] = (hid_t_f)H5Tcopy(H5T_NATIVE_LONG)) < 0) return ret_value;
} /*end if */
else
- if (sizeof(int_f) == sizeof(long_long)) {
+ if (sizeof(int_f) == sizeof(long long)) {
if ((types[0] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
} /*end else */
@@ -115,7 +115,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
else if (sizeof(int_1_f) == sizeof(int)) {
if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
} /*end if */
- else if (sizeof(int_1_f) == sizeof(long_long)) {
+ else if (sizeof(int_1_f) == sizeof(long long)) {
if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
} /*end else */
@@ -128,7 +128,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
else if (sizeof(int_2_f) == sizeof(int)) {
if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
} /*end if */
- else if (sizeof(int_2_f) == sizeof(long_long)) {
+ else if (sizeof(int_2_f) == sizeof(long long)) {
if ((types[7] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
} /*end else */
@@ -141,7 +141,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
else if (sizeof(int_4_f) == sizeof(int)) {
if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
} /*end if */
- else if (sizeof(int_4_f) == sizeof(long_long)) {
+ else if (sizeof(int_4_f) == sizeof(long long)) {
if ((types[8] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
} /*end else */
@@ -154,7 +154,7 @@ nh5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertype
else if (sizeof(int_8_f) == sizeof(int)) {
if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_INT)) < 0) return ret_value;
} /*end if */
- else if (sizeof(int_8_f) == sizeof(long_long)) {
+ else if (sizeof(int_8_f) == sizeof(long long)) {
if ((types[9] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
} /*end else */
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index 034ff72..091d0c8 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -160,8 +160,8 @@ int main()
/* First, define c_int_x */
#if defined H5_FORTRAN_HAS_INTEGER_1
- if(sizeof(long_long) == 1)
- writeTypedef("long_long", 1);
+ if(sizeof(long long) == 1)
+ writeTypedef("long long", 1);
else if(sizeof(long) == 1)
writeTypedef("long", 1);
else if(sizeof(int) == 1)
@@ -176,8 +176,8 @@ int main()
#endif /*H5_FORTRAN_HAS_INTEGER_1 */
#if defined H5_FORTRAN_HAS_INTEGER_2
- if(sizeof(long_long) == 2)
- writeTypedef("long_long", 2);
+ if(sizeof(long long) == 2)
+ writeTypedef("long long", 2);
else if(sizeof(long) == 2)
writeTypedef("long", 2);
else if(sizeof(int) == 2)
@@ -189,8 +189,8 @@ int main()
#endif /*H5_FORTRAN_HAS_INTEGER_2 */
#if defined H5_FORTRAN_HAS_INTEGER_4
- if(sizeof(long_long) == 4)
- writeTypedef("long_long", 4);
+ if(sizeof(long long) == 4)
+ writeTypedef("long long", 4);
else if(sizeof(long) == 4)
writeTypedef("long", 4);
else if(sizeof(int) == 4)
@@ -202,8 +202,8 @@ int main()
#endif /*H5_FORTRAN_HAS_INTEGER_4 */
#if defined H5_FORTRAN_HAS_INTEGER_8
- if(sizeof(long_long) == 8)
- writeTypedef("long_long", 8);
+ if(sizeof(long long) == 8)
+ writeTypedef("long long", 8);
else if(sizeof(long) == 8)
writeTypedef("long", 8);
else if(sizeof(int) == 8)
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index 492e8b8..8f0e29e 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -87,7 +87,7 @@ herr_t H5IMmake_image_8bitf(hid_t loc_id,
} else if(sizeof(int_f) == sizeof(long)) {
if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
return -1;
- } else if(sizeof(int_f) == sizeof(long_long)) {
+ } else if(sizeof(int_f) == sizeof(long long)) {
if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
return -1;
} else
@@ -200,7 +200,7 @@ herr_t H5IMmake_image_24bitf(hid_t loc_id,
} else if(sizeof(int_f) == sizeof(long)) {
if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
return -1;
- } else if(sizeof(int_f) == sizeof(long_long)) {
+ } else if(sizeof(int_f) == sizeof(long long)) {
if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
return -1;
} else
@@ -276,7 +276,7 @@ herr_t H5IMread_imagef(hid_t loc_id,
tid = H5T_NATIVE_INT;
else if(sizeof(int_f) == sizeof(long))
tid = H5T_NATIVE_LONG;
- else if(sizeof(int_f) == sizeof(long_long))
+ else if(sizeof(int_f) == sizeof(long long))
tid = H5T_NATIVE_LLONG;
else
goto out;
@@ -360,7 +360,7 @@ herr_t H5IMmake_palettef(hid_t loc_id,
} else if(sizeof(int_f) == sizeof(long)) {
if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
return -1;
- } else if(sizeof(int_f) == sizeof(long_long)) {
+ } else if(sizeof(int_f) == sizeof(long long)) {
if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
return -1;
} else
@@ -424,7 +424,7 @@ herr_t H5IMget_palettef(hid_t loc_id,
return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_INT,pal_data);
else if(sizeof(int_f) == sizeof(long))
return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LONG,pal_data);
- else if(sizeof(int_f) == sizeof(long_long))
+ else if(sizeof(int_f) == sizeof(long long))
return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LLONG,pal_data);
else
return -1;
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 6aa3354..93d65ef 100755
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -682,7 +682,7 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id,
ret = H5LTset_attribute_int(c_loc_id,c_name,c_attrname,buf,c_size);
else if (sizeof(int_f) == sizeof(long))
ret = H5LTset_attribute_long(c_loc_id,c_name,c_attrname,buf,c_size);
- else if (sizeof(int_f) == sizeof(long_long))
+ else if (sizeof(int_f) == sizeof(long long))
ret = H5LTset_attribute_long_long(c_loc_id,c_name,c_attrname,buf,c_size);
else
return ret_value;
@@ -928,7 +928,7 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id,
ret = H5LTget_attribute_int(c_loc_id,c_name,c_attrname,buf);
else if (sizeof(int_f) == sizeof(long))
ret = H5LTget_attribute_long(c_loc_id,c_name,c_attrname,buf);
- else if (sizeof(int_f) == sizeof(long_long))
+ else if (sizeof(int_f) == sizeof(long long))
ret = H5LTget_attribute_long_long(c_loc_id,c_name,c_attrname,buf);
else
return ret_value;
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 78df61a..92965fd 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -1227,7 +1227,7 @@ herr_t H5LTset_attribute_long( hid_t loc_id,
herr_t H5LTset_attribute_long_long( hid_t loc_id,
const char *obj_name,
const char *attr_name,
- const long_long *data,
+ const long long *data,
size_t size )
{
@@ -2557,7 +2557,7 @@ herr_t H5LTget_attribute_long( hid_t loc_id,
herr_t H5LTget_attribute_long_long( hid_t loc_id,
const char *obj_name,
const char *attr_name,
- long_long *data )
+ long long *data )
{
/* Get the attribute */
if(H5LT_get_attribute_mem(loc_id, obj_name, attr_name, H5T_NATIVE_LLONG, data) < 0)
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 9f67175..6e5e08b 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -1053,7 +1053,7 @@ case 92:
short short_val=(short)yylval.ival;
int int_val=(int)yylval.ival;
long long_val=(long)yylval.ival;
- long_long llong_val=(long_long)yylval.ival;
+ long long llong_val=(long long)yylval.ival;
hid_t super = H5Tget_super(enum_id);
hid_t native = H5Tget_native_type(super, H5T_DIR_ASCEND);
diff --git a/hl/src/H5LTpublic.h b/hl/src/H5LTpublic.h
index 05670d2..7fb873a 100644
--- a/hl/src/H5LTpublic.h
+++ b/hl/src/H5LTpublic.h
@@ -203,7 +203,7 @@ H5_HLDLL herr_t H5LTset_attribute_long( hid_t loc_id,
H5_HLDLL herr_t H5LTset_attribute_long_long( hid_t loc_id,
const char *obj_name,
const char *attr_name,
- const long_long *buffer,
+ const long long *buffer,
size_t size );
H5_HLDLL herr_t H5LTset_attribute_ulong( hid_t loc_id,
@@ -280,7 +280,7 @@ H5_HLDLL herr_t H5LTget_attribute_long( hid_t loc_id,
H5_HLDLL herr_t H5LTget_attribute_long_long( hid_t loc_id,
const char *obj_name,
const char *attr_name,
- long_long *data );
+ long long *data );
H5_HLDLL herr_t H5LTget_attribute_ulong( hid_t loc_id,
const char *obj_name,
diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 6124bce..c5214d3 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -248,26 +248,26 @@ do_pio(parameters param)
/* Validate transfer buffer size & block size*/
if(blk_size<=0) {
HDfprintf(stderr,
- "Transfer block size (%Hd) must be > 0\n", (long_long)blk_size);
+ "Transfer block size (%Hd) must be > 0\n", (long long)blk_size);
GOTOERROR(FAIL);
}
if(buf_size<=0) {
HDfprintf(stderr,
- "Transfer buffer size (%Hd) must be > 0\n", (long_long)buf_size);
+ "Transfer buffer size (%Hd) must be > 0\n", (long long)buf_size);
GOTOERROR(FAIL);
}
if ((buf_size % blk_size) != 0){
HDfprintf(stderr,
"Transfer buffer size (%Hd) must be a multiple of the "
"interleaved I/O block size (%Hd)\n",
- (long_long)buf_size, (long_long)blk_size);
+ (long long)buf_size, (long long)blk_size);
GOTOERROR(FAIL);
}
if((snbytes%pio_mpi_nprocs_g)!=0) {
HDfprintf(stderr,
"Dataset size (%Hd) must be a multiple of the "
"number of processes (%d)\n",
- (long_long)snbytes, pio_mpi_nprocs_g);
+ (long long)snbytes, pio_mpi_nprocs_g);
GOTOERROR(FAIL);
}
@@ -276,7 +276,7 @@ do_pio(parameters param)
HDfprintf(stderr,
"Dataset size/process (%Hd) must be a multiple of the "
"trasfer buffer size (%Hd)\n",
- (long_long)(snbytes/pio_mpi_nprocs_g), (long_long)buf_size);
+ (long long)(snbytes/pio_mpi_nprocs_g), (long long)buf_size);
GOTOERROR(FAIL);
}
}
@@ -285,7 +285,7 @@ do_pio(parameters param)
HDfprintf(stderr,
"Dataset side size (%Hd) must be a multiple of the "
"trasfer buffer size (%Hd)\n",
- (long_long)snbytes, (long_long)buf_size);
+ (long long)snbytes, (long long)buf_size);
GOTOERROR(FAIL);
}
}
@@ -293,7 +293,7 @@ do_pio(parameters param)
/* Allocate transfer buffer */
if ((buffer = malloc(bsize)) == NULL){
HDfprintf(stderr, "malloc for transfer buffer size (%Hd) failed\n",
- (long_long)(bsize));
+ (long long)(bsize));
GOTOERROR(FAIL);
}
@@ -651,13 +651,13 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
if (!parms->dim2d) {
HDfprintf(output, "Debug(do_write): "
"buf_size=%Hd, bytes_begin=%Hd, bytes_count=%Hd\n",
- (long_long)buf_size, (long_long)bytes_begin[0],
- (long_long)bytes_count);
+ (long long)buf_size, (long long)bytes_begin[0],
+ (long long)bytes_count);
} else {
HDfprintf(output, "Debug(do_write): "
"linear buf_size=%Hd, bytes_begin=(%Hd,%Hd), bytes_count=%Hd\n",
- (long_long)buf_size*blk_size, (long_long)bytes_begin[0],
- (long_long)bytes_begin[1], (long_long)bytes_count);
+ (long long)buf_size*blk_size, (long long)bytes_begin[0],
+ (long long)bytes_begin[1], (long long)bytes_count);
}
}
@@ -1625,13 +1625,13 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
if (!parms->dim2d) {
HDfprintf(output, "Debug(do_write): "
"buf_size=%Hd, bytes_begin=%Hd, bytes_count=%Hd\n",
- (long_long)buf_size, (long_long)bytes_begin[0],
- (long_long)bytes_count);
+ (long long)buf_size, (long long)bytes_begin[0],
+ (long long)bytes_count);
} else {
HDfprintf(output, "Debug(do_write): "
"linear buf_size=%Hd, bytes_begin=(%Hd,%Hd), bytes_count=%Hd\n",
- (long_long)buf_size*blk_size, (long_long)bytes_begin[0],
- (long_long)bytes_begin[1], (long_long)bytes_count);
+ (long long)buf_size*blk_size, (long long)bytes_begin[0],
+ (long long)bytes_begin[1], (long long)bytes_count);
}
}
@@ -2337,8 +2337,8 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
HDprint_rank(output);
HDfprintf(output, "read data error, expected (%Hd), "
"got (%Hd)\n",
- (long_long)pio_mpi_rank_g+1,
- (long_long)*(ucharptr-1));
+ (long long)pio_mpi_rank_g+1,
+ (long long)*(ucharptr-1));
} /* end if */
} /* end if */
} /* end for */
diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index b19c7fb..a6057b3 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -1107,7 +1107,7 @@ print_indent(register int indent)
}
static void
-recover_size_and_print(long_long val, const char *end)
+recover_size_and_print(long long val, const char *end)
{
if (val >= ONE_KB && (val % ONE_KB) == 0) {
if (val >= ONE_MB && (val % ONE_MB) == 0) {
@@ -1147,67 +1147,67 @@ report_parameters(struct options *opts)
print_io_api(opts->io_types);
HDfprintf(output, "rank %d: Number of files=%Hd\n", rank,
- (long_long)opts->num_files);
+ (long long)opts->num_files);
HDfprintf(output, "rank %d: Number of datasets=%Hd\n", rank,
- (long_long)opts->num_dsets);
+ (long long)opts->num_dsets);
HDfprintf(output, "rank %d: Number of iterations=%Hd\n", rank,
- (long_long)opts->num_iters);
+ (long long)opts->num_iters);
HDfprintf(output, "rank %d: Number of processes=%d:%d\n", rank,
opts->min_num_procs, opts->max_num_procs);
if (opts->dim2d){
HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
- recover_size_and_print((long_long)(opts->num_bpp * opts->num_bpp * opts->min_num_procs), ":");
- recover_size_and_print((long_long)(opts->num_bpp * opts->num_bpp * opts->max_num_procs), "\n");
+ recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->min_num_procs), ":");
+ recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->max_num_procs), "\n");
HDfprintf(output, "rank %d: Size of dataset(s)=", rank);
- recover_size_and_print((long_long)(opts->num_bpp * opts->min_num_procs), "x");
- recover_size_and_print((long_long)(opts->num_bpp * opts->min_num_procs), ":");
- recover_size_and_print((long_long)(opts->num_bpp * opts->max_num_procs), "x");
- recover_size_and_print((long_long)(opts->num_bpp * opts->max_num_procs), "\n");
+ recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), "x");
+ recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":");
+ recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "x");
+ recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
HDfprintf(output, "rank %d: File size=", rank);
- recover_size_and_print((long_long)(pow(opts->num_bpp * opts->min_num_procs,2)
+ recover_size_and_print((long long)(pow(opts->num_bpp * opts->min_num_procs,2)
* opts->num_dsets), ":");
- recover_size_and_print((long_long)(pow(opts->num_bpp * opts->max_num_procs,2)
+ recover_size_and_print((long long)(pow(opts->num_bpp * opts->max_num_procs,2)
* opts->num_dsets), "\n");
HDfprintf(output, "rank %d: Transfer buffer size=", rank);
if(opts->interleaved){
- recover_size_and_print((long_long)opts->min_xfer_size, "x");
- recover_size_and_print((long_long)opts->blk_size, ":");
- recover_size_and_print((long_long)opts->max_xfer_size, "x");
- recover_size_and_print((long_long)opts->blk_size, "\n");
+ recover_size_and_print((long long)opts->min_xfer_size, "x");
+ recover_size_and_print((long long)opts->blk_size, ":");
+ recover_size_and_print((long long)opts->max_xfer_size, "x");
+ recover_size_and_print((long long)opts->blk_size, "\n");
}
else{
- recover_size_and_print((long_long)opts->blk_size, "x");
- recover_size_and_print((long_long)opts->min_xfer_size, ":");
- recover_size_and_print((long_long)opts->blk_size, "x");
- recover_size_and_print((long_long)opts->max_xfer_size, "\n");
+ recover_size_and_print((long long)opts->blk_size, "x");
+ recover_size_and_print((long long)opts->min_xfer_size, ":");
+ recover_size_and_print((long long)opts->blk_size, "x");
+ recover_size_and_print((long long)opts->max_xfer_size, "\n");
}
HDfprintf(output, "rank %d: Block size=", rank);
- recover_size_and_print((long_long)opts->blk_size, "x");
- recover_size_and_print((long_long)opts->blk_size, "\n");
+ recover_size_and_print((long long)opts->blk_size, "x");
+ recover_size_and_print((long long)opts->blk_size, "\n");
}
else{
HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank);
- recover_size_and_print((long_long)opts->num_bpp, "\n");
+ recover_size_and_print((long long)opts->num_bpp, "\n");
HDfprintf(output, "rank %d: Size of dataset(s)=", rank);
- recover_size_and_print((long_long)(opts->num_bpp * opts->min_num_procs), ":");
- recover_size_and_print((long_long)(opts->num_bpp * opts->max_num_procs), "\n");
+ recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":");
+ recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n");
HDfprintf(output, "rank %d: File size=", rank);
- recover_size_and_print((long_long)(opts->num_bpp * opts->min_num_procs
+ recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs
* opts->num_dsets), ":");
- recover_size_and_print((long_long)(opts->num_bpp * opts->max_num_procs
+ recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs
* opts->num_dsets), "\n");
HDfprintf(output, "rank %d: Transfer buffer size=", rank);
- recover_size_and_print((long_long)opts->min_xfer_size, ":");
- recover_size_and_print((long_long)opts->max_xfer_size, "\n");
+ recover_size_and_print((long long)opts->min_xfer_size, ":");
+ recover_size_and_print((long long)opts->max_xfer_size, "\n");
HDfprintf(output, "rank %d: Block size=", rank);
- recover_size_and_print((long_long)opts->blk_size, "\n");
+ recover_size_and_print((long long)opts->blk_size, "\n");
}
HDfprintf(output, "rank %d: Block Pattern in Dataset=", rank);
diff --git a/perform/pio_standalone.h b/perform/pio_standalone.h
index af67a35..ab4ee94 100644
--- a/perform/pio_standalone.h
+++ b/perform/pio_standalone.h
@@ -132,25 +132,6 @@ typedef off_t h5_stat_size_t;
# define TRUE 1
#endif
-/*
- * Although `long long' is part of the revised ANSI-C some compilers don't
- * support it yet. We define `long_long' as the longest integral integer type
- * supported by the compiler, usually 64 bits. It must be legal to qualify
- * `long_long' with `unsigned'.
- */
-#if H5_SIZEOF_LONG_LONG>0
-# define long_long long long
-#elif H5_SIZEOF___INT64>0
-# define long_long __int64 /*Win32*/
-# undef H5_SIZEOF_LONG_LONG
-# define H5_SIZEOF_LONG_LONG H5_SIZEOF___INT64
-#else
-# define long_long long int
-# undef H5_SIZEOF_LONG_LONG
-# define H5_SIZEOF_LONG_LONG H5_SIZEOF_LONG
-#endif
-
-
/** From h5test.h **/
diff --git a/perform/sio_engine.c b/perform/sio_engine.c
index a6a7fa1..0fdfac5 100644
--- a/perform/sio_engine.c
+++ b/perform/sio_engine.c
@@ -202,7 +202,7 @@ do_sio(parameters param)
/* Validate transfer buffer size */
if (param.buf_size[i]<=0) {
HDfprintf(stderr,
- "Transfer buffer size[%d] (%Hd) must be > 0\n", i,(long_long)buf_size[i]);
+ "Transfer buffer size[%d] (%Hd) must be > 0\n", i,(long long)buf_size[i]);
GOTOERROR(FAIL);
}
@@ -210,7 +210,7 @@ do_sio(parameters param)
HDfprintf(stderr,
"Dataset size[%d] (%Hd) must be a multiple of the "
"trasfer buffer size[%d] (%Hd)\n",param.rank,
- (long_long)param.dset_size[i], param.rank, (long_long)param.buf_size[i]);
+ (long long)param.dset_size[i], param.rank, (long long)param.buf_size[i]);
GOTOERROR(FAIL);
}
@@ -220,7 +220,7 @@ do_sio(parameters param)
buffer2 = malloc(linear_buf_size);
if ((buffer = malloc(linear_buf_size)) == NULL){
HDfprintf(stderr, "malloc for transfer buffer size (%Hd) failed\n",
- (long_long)(linear_buf_size));
+ (long long)(linear_buf_size));
GOTOERROR(FAIL);
}
diff --git a/perform/sio_perf.c b/perform/sio_perf.c
index b0f81f4..271bf20 100644
--- a/perform/sio_perf.c
+++ b/perform/sio_perf.c
@@ -820,7 +820,7 @@ print_indent(register int indent)
}
static void
-recover_size_and_print(long_long val, const char *end)
+recover_size_and_print(long long val, const char *end)
{
if (val >= ONE_KB && (val % ONE_KB) == 0) {
if (val >= ONE_MB && (val % ONE_MB) == 0) {
@@ -859,23 +859,23 @@ report_parameters(struct options *opts)
print_io_api(opts->io_types);
HDfprintf(output, "Number of iterations=%Hd\n",
- (long_long)opts->num_iters);
+ (long long)opts->num_iters);
HDfprintf(output, "Dataset size=");
for (i=0; i<rank; i++)
- recover_size_and_print((long_long)opts->dset_size[i], " ");
+ recover_size_and_print((long long)opts->dset_size[i], " ");
HDfprintf(output, "\n");
HDfprintf(output, "Transfer buffer size=");
for (i=0; i<rank; i++)
- recover_size_and_print((long_long)opts->buf_size[i], " ");
+ recover_size_and_print((long long)opts->buf_size[i], " ");
HDfprintf(output, "\n");
HDfprintf(output, "Dimension access order=");
for (i=0; i<rank; i++)
- recover_size_and_print((long_long)opts->order[i], " ");
+ recover_size_and_print((long long)opts->order[i], " ");
HDfprintf(output, "\n");
if (opts->io_types & SIO_HDF5) {
@@ -887,7 +887,7 @@ report_parameters(struct options *opts)
HDfprintf(output, "Chunked\n");
HDfprintf(output, "HDF5 chunk size=");
for (i=0; i<rank; i++)
- recover_size_and_print((long_long)opts->chk_size[i], " ");
+ recover_size_and_print((long long)opts->chk_size[i], " ");
HDfprintf(output, "\n");
HDfprintf(output, "HDF5 dataset dimensions=");
diff --git a/perform/sio_standalone.h b/perform/sio_standalone.h
index 7b32c66..9faaac1 100644
--- a/perform/sio_standalone.h
+++ b/perform/sio_standalone.h
@@ -486,24 +486,6 @@ extern char *strdup(const char *s);
# define TRUE 1
#endif
-/*
- * Although `long long' is part of the revised ANSI-C some compilers don't
- * support it yet. We define `long_long' as the longest integral integer type
- * supported by the compiler, usually 64 bits. It must be legal to qualify
- * `long_long' with `unsigned'.
- */
-#if H5_SIZEOF_LONG_LONG>0
-# define long_long long long
-#elif H5_SIZEOF___INT64>0
-# define long_long __int64 /*Win32*/
-# undef H5_SIZEOF_LONG_LONG
-# define H5_SIZEOF_LONG_LONG H5_SIZEOF___INT64
-#else
-# define long_long long int
-# undef H5_SIZEOF_LONG_LONG
-# define H5_SIZEOF_LONG_LONG H5_SIZEOF_LONG
-#endif
-
/** From h5test.h **/
#ifdef H5_HAVE_PARALLEL
diff --git a/src/H5EA.c b/src/H5EA.c
index 86c54fd..f1ed71b 100644
--- a/src/H5EA.c
+++ b/src/H5EA.c
@@ -199,7 +199,7 @@ H5EA_open(H5F_t *f, hid_t dxpl_id, haddr_t ea_addr, const H5EA_class_t *cls))
HDfprintf(stderr, "%s: ea_addr = %a\n", FUNC, ea_addr);
#endif /* QAK */
if(NULL == (hdr = (H5EA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_EARRAY_HDR, ea_addr, cls, NULL, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to load extensible array header, address = %llu", (unsigned long_long)ea_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to load extensible array header, address = %llu", (unsigned long long)ea_addr)
/* Check for pending array deletion */
if(hdr->pending_delete)
@@ -365,7 +365,7 @@ HDfprintf(stderr, "%s: Index block address is: %a\n", FUNC, hdr->idx_blk_addr);
/* Protect index block */
if(NULL == (iblock = H5EA__iblock_protect(hdr, dxpl_id, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
/* Check if element is in index block */
if(idx < hdr->cparam.idx_blk_elmts) {
@@ -420,7 +420,7 @@ HDfprintf(stderr, "%s: dblk_idx = %u, iblock->ndblk_addrs = %Zu\n", FUNC, dblk_i
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, iblock->dblk_addrs[dblk_idx], hdr->sblk_info[sblk_idx].dblk_nelmts, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)iblock->dblk_addrs[dblk_idx])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)iblock->dblk_addrs[dblk_idx])
/* Adjust index to offset in data block */
elmt_idx %= hdr->sblk_info[sblk_idx].dblk_nelmts;
@@ -455,7 +455,7 @@ HDfprintf(stderr, "%s: New super block address is: %a\n", FUNC, sblk_addr);
/* Protect super block */
if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, iblock->sblk_addrs[sblk_off], sblk_idx, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)iblock->sblk_addrs[sblk_off])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)iblock->sblk_addrs[sblk_off])
/* Compute the data block index in super block */
dblk_idx = (size_t)(elmt_idx / sblock->dblk_nelmts);
@@ -532,7 +532,7 @@ HDfprintf(stderr, "%s: sblock->dblk_page_size = %Zu\n", FUNC, sblock->dblk_page_
/* Protect data block page */
if(NULL == (dblk_page = H5EA__dblk_page_protect(hdr, dxpl_id, dblk_page_addr, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long_long)dblk_page_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long long)dblk_page_addr)
/* Set pointer to elements */
elmts = dblk_page->elmts;
@@ -540,7 +540,7 @@ HDfprintf(stderr, "%s: sblock->dblk_page_size = %Zu\n", FUNC, sblock->dblk_page_
else {
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, sblock->dblk_addrs[dblk_idx], sblock->dblk_nelmts, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)sblock->dblk_addrs[dblk_idx])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)sblock->dblk_addrs[dblk_idx])
/* Set pointer to elements */
elmts = dblock->elmts;
@@ -639,7 +639,7 @@ HDfprintf(stderr, "%s: Index block address is: %a\n", FUNC, hdr->idx_blk_addr);
/* Protect index block */
if(NULL == (iblock = H5EA__iblock_protect(hdr, dxpl_id, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
/* Check if element is in index block */
if(idx < hdr->cparam.idx_blk_elmts) {
@@ -681,7 +681,7 @@ HDfprintf(stderr, "%s: dblk_idx = %u\n", FUNC, dblk_idx);
else {
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, iblock->dblk_addrs[dblk_idx], hdr->sblk_info[sblk_idx].dblk_nelmts, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)iblock->dblk_addrs[dblk_idx])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)iblock->dblk_addrs[dblk_idx])
/* Adjust index to offset in data block */
elmt_idx %= hdr->sblk_info[sblk_idx].dblk_nelmts;
@@ -705,7 +705,7 @@ HDfprintf(stderr, "%s: dblk_idx = %u\n", FUNC, dblk_idx);
else {
/* Protect super block */
if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, iblock->sblk_addrs[sblk_off], sblk_idx, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)iblock->sblk_addrs[sblk_off])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)iblock->sblk_addrs[sblk_off])
/* Compute the data block index in super block */
dblk_idx = (size_t)(elmt_idx / sblock->dblk_nelmts);
@@ -779,7 +779,7 @@ HDfprintf(stderr, "%s: elmt_idx = %Hu, dblk_page_addr = %a\n", FUNC, elmt_idx, d
/* Protect data block page */
if(NULL == (dblk_page = H5EA__dblk_page_protect(hdr, dxpl_id, dblk_page_addr, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long_long)dblk_page_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long long)dblk_page_addr)
/* Set pointer to elements */
elmts = dblk_page->elmts;
@@ -788,7 +788,7 @@ HDfprintf(stderr, "%s: elmt_idx = %Hu, dblk_page_addr = %a\n", FUNC, elmt_idx, d
else {
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, sblock->dblk_addrs[dblk_idx], sblock->dblk_nelmts, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)sblock->dblk_addrs[dblk_idx])
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)sblock->dblk_addrs[dblk_idx])
/* Set pointer to elements */
elmts = dblock->elmts;
@@ -924,7 +924,7 @@ H5EA_delete(H5F_t *f, hid_t dxpl_id, haddr_t ea_addr))
HDfprintf(stderr, "%s: ea_addr = %a\n", FUNC, ea_addr);
#endif /* QAK */
if(NULL == (hdr = (H5EA_hdr_t *)H5AC_protect(f, dxpl_id, H5AC_EARRAY_HDR, ea_addr, NULL, NULL, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array header, address = %llu", (unsigned long_long)ea_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array header, address = %llu", (unsigned long long)ea_addr)
/* Check for files using shared array header */
if(hdr->file_rc)
diff --git a/src/H5EAdbg.c b/src/H5EAdbg.c
index 0cafe3d..2c903b2 100644
--- a/src/H5EAdbg.c
+++ b/src/H5EAdbg.c
@@ -208,7 +208,7 @@ H5EA__iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
/* Protect index block */
if(NULL == (iblock = H5EA__iblock_protect(hdr, dxpl_id, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
/* Print opening message */
HDfprintf(stream, "%*sExtensible Array Index Block...\n", indent, "");
@@ -321,7 +321,7 @@ H5EA__sblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
/* Protect super block */
if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, addr, sblk_idx, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)addr)
/* Print opening message */
HDfprintf(stream, "%*sExtensible Array Super Block...\n", indent, "");
@@ -405,7 +405,7 @@ H5EA__dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, addr, dblk_nelmts, H5AC_READ)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)addr)
/* Print opening message */
HDfprintf(stream, "%*sExtensible Array data Block...\n", indent, "");
diff --git a/src/H5EAdblkpage.c b/src/H5EAdblkpage.c
index 4b9cc9d..a8edae1 100644
--- a/src/H5EAdblkpage.c
+++ b/src/H5EAdblkpage.c
@@ -223,7 +223,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect the data block page */
if(NULL == (ret_value = (H5EA_dblk_page_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_DBLK_PAGE, dblk_page_addr, NULL, hdr, rw)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long_long)dblk_page_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long long)dblk_page_addr)
CATCH
@@ -260,7 +260,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Unprotect the data block page */
if(H5AC_unprotect(dblk_page->hdr->f, dxpl_id, H5AC_EARRAY_DBLK_PAGE, dblk_page->addr, dblk_page, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array data block page, address = %llu", (unsigned long_long)dblk_page->addr)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array data block page, address = %llu", (unsigned long long)dblk_page->addr)
CATCH
diff --git a/src/H5EAdblock.c b/src/H5EAdblock.c
index aec5af2..af2828a 100644
--- a/src/H5EAdblock.c
+++ b/src/H5EAdblock.c
@@ -317,7 +317,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect the data block */
if(NULL == (ret_value = (H5EA_dblock_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_DBLOCK, dblk_addr, &dblk_nelmts, hdr, rw)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)dblk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)dblk_addr)
CATCH
@@ -352,7 +352,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Unprotect the data block */
if(H5AC_unprotect(dblock->hdr->f, dxpl_id, H5AC_EARRAY_DBLOCK, dblock->addr, dblock, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array data block, address = %llu", (unsigned long_long)dblock->addr)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array data block, address = %llu", (unsigned long long)dblock->addr)
CATCH
@@ -391,7 +391,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect data block */
if(NULL == (dblock = H5EA__dblock_protect(hdr, dxpl_id, dblk_addr, dblk_nelmts, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long_long)dblk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block, address = %llu", (unsigned long long)dblk_addr)
/* Check if this is a paged data block */
if(dblk_nelmts > hdr->dblk_page_nelmts) {
diff --git a/src/H5EAiblock.c b/src/H5EAiblock.c
index 6fd6f2a..2d93015 100644
--- a/src/H5EAiblock.c
+++ b/src/H5EAiblock.c
@@ -292,7 +292,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect the index block */
if(NULL == (ret_value = (H5EA_iblock_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_IBLOCK, hdr->idx_blk_addr, NULL, hdr, rw)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
CATCH
@@ -327,7 +327,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Unprotect the index block */
if(H5AC_unprotect(iblock->hdr->f, dxpl_id, H5AC_EARRAY_IBLOCK, iblock->addr, iblock, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array index block, address = %llu", (unsigned long_long)iblock->addr)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array index block, address = %llu", (unsigned long long)iblock->addr)
CATCH
@@ -364,7 +364,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect index block */
if(NULL == (iblock = H5EA__iblock_protect(hdr, dxpl_id, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long_long)hdr->idx_blk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array index block, address = %llu", (unsigned long long)hdr->idx_blk_addr)
/* Check for index block having data block pointers */
if(iblock->ndblk_addrs > 0) {
diff --git a/src/H5EAsblock.c b/src/H5EAsblock.c
index 4ad83b0..3cb97a9 100644
--- a/src/H5EAsblock.c
+++ b/src/H5EAsblock.c
@@ -289,7 +289,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect the super block */
if(NULL == (ret_value = (H5EA_sblock_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_SBLOCK, sblk_addr, &sblk_idx, hdr, rw)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)sblk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)sblk_addr)
CATCH
@@ -324,7 +324,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Unprotect the super block */
if(H5AC_unprotect(sblock->hdr->f, dxpl_id, H5AC_EARRAY_SBLOCK, sblock->addr, sblock, cache_flags) < 0)
- H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array super block, address = %llu", (unsigned long_long)sblock->addr)
+ H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array super block, address = %llu", (unsigned long long)sblock->addr)
CATCH
@@ -363,7 +363,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
/* Protect super block */
if(NULL == (sblock = H5EA__sblock_protect(hdr, dxpl_id, sblk_addr, sblk_idx, H5AC_WRITE)))
- H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long_long)sblk_addr)
+ H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array super block, address = %llu", (unsigned long long)sblk_addr)
/* Iterate over data blocks */
for(u = 0; u < sblock->ndblks; u++) {
diff --git a/src/H5EAtest.c b/src/H5EAtest.c
index 31dfb5f..58e8bc2 100644
--- a/src/H5EAtest.c
+++ b/src/H5EAtest.c
@@ -320,9 +320,9 @@ H5EA__test_debug(FILE *stream, int indent, int fwidth, hsize_t idx,
HDassert(elmt);
/* Print element */
- sprintf(temp_str, "Element #%llu:", (unsigned long_long)idx);
+ sprintf(temp_str, "Element #%llu:", (unsigned long long)idx);
HDfprintf(stream, "%*s%-*s %llu\n", indent, "", fwidth, temp_str,
- (unsigned long_long)*(const uint64_t *)elmt);
+ (unsigned long long)*(const uint64_t *)elmt);
END_FUNC(STATIC) /* end H5EA__test_debug() */
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 2be54f8..e0421a7 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1945,9 +1945,9 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
if (HADDR_UNDEF!=file->memb_addr[mt]) {
haddr_t eoa = H5FDget_eoa(file->memb[mt], mt);
fprintf(stderr, " %6d %20llu %20llu %20llu %s\n",
- (int)mt, (unsigned long_long)(file->memb_addr[mt]),
- (unsigned long_long)eoa,
- (unsigned long_long)(file->memb_next[mt]),
+ (int)mt, (unsigned long long)(file->memb_addr[mt]),
+ (unsigned long long)eoa,
+ (unsigned long long)(file->memb_next[mt]),
file->memb_name[mt]);
}
}
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 5334539..7b76f3d 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -1035,7 +1035,7 @@ H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc,
new_oloc.addr = dst_oloc->addr;
/* Pick a default name for the new object */
- sprintf(tmp_obj_name, "~obj_pointed_by_%llu", (unsigned long_long)dst_oloc->addr);
+ sprintf(tmp_obj_name, "~obj_pointed_by_%llu", (unsigned long long)dst_oloc->addr);
/* Create a link to the newly copied object */
if(H5L_link(dst_root_loc, tmp_obj_name, &new_loc, H5P_DEFAULT, H5P_DEFAULT, dxpl_id) < 0)
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index e22a105..fd7cc8b 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -731,7 +731,7 @@ H5O_shared_debug(const H5O_shared_t *mesg, FILE *stream, int indent, int fwidth)
"SOHM");
HDfprintf(stream, "%*s%-*s %016llx\n", indent, "", fwidth,
"Heap ID:",
- (unsigned long_long)mesg->u.heap_id);
+ (unsigned long long)mesg->u.heap_id);
break;
case H5O_SHARE_TYPE_HERE:
diff --git a/src/H5T.c b/src/H5T.c
index 7e978e7..0345e5f 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1052,7 +1052,7 @@ H5T_init_interface(void)
status |= H5T_register(H5T_PERS_HARD, "ldbl_dbl", native_ldouble, native_double, H5T_conv_ldouble_double, H5AC_dxpl_id, FALSE);
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
- /* from long_long */
+ /* from long long */
status |= H5T_register(H5T_PERS_HARD, "llong_ullong", native_llong, native_ullong, H5T_conv_llong_ullong, H5AC_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "ullong_llong", native_ullong, native_llong, H5T_conv_ullong_llong, H5AC_dxpl_id, FALSE);
status |= H5T_register(H5T_PERS_HARD, "llong_long", native_llong, native_long, H5T_conv_llong_long, H5AC_dxpl_id, FALSE);
@@ -2992,7 +2992,7 @@ H5T_create(H5T_class_t type, size_t size)
subtype = H5T_NATIVE_INT_g;
} else if (sizeof(long)==size) {
subtype = H5T_NATIVE_LONG_g;
- } else if (sizeof(long_long)==size) {
+ } else if (sizeof(long long)==size) {
subtype = H5T_NATIVE_LLONG_g;
} else {
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "no applicable native integer type");
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 05277a8..90b7a21 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -241,7 +241,7 @@
#define H5T_CONV_sS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)<=sizeof(DT)); \
- H5T_CONV(H5T_CONV_xX, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_xX, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_sU_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -266,7 +266,7 @@
#define H5T_CONV_sU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)<=sizeof(DT)); \
- H5T_CONV(H5T_CONV_sU, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_sU, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_uS_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -291,17 +291,17 @@
#define H5T_CONV_uS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)<=sizeof(DT)); \
- H5T_CONV(H5T_CONV_uS, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_uS, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_uU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)<=sizeof(DT)); \
- H5T_CONV(H5T_CONV_xX, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_xX, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_Ss(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)>=sizeof(DT)); \
- H5T_CONV(H5T_CONV_Xx, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_Xx, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_Su_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -337,17 +337,17 @@
#define H5T_CONV_Su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)>=sizeof(DT)); \
- H5T_CONV(H5T_CONV_Su, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_Su, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_Us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)>=sizeof(DT)); \
- H5T_CONV(H5T_CONV_Ux, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_Ux, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_Uu(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)>=sizeof(DT)); \
- H5T_CONV(H5T_CONV_Ux, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_Ux, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_su_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -374,7 +374,7 @@
#define H5T_CONV_su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)==sizeof(DT)); \
- H5T_CONV(H5T_CONV_su, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_su, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_us_CORE(S,D,ST,DT,D_MIN,D_MAX) { \
@@ -401,7 +401,7 @@
#define H5T_CONV_us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
assert(sizeof(ST)==sizeof(DT)); \
- H5T_CONV(H5T_CONV_us, long_long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
+ H5T_CONV(H5T_CONV_us, long long, STYPE, DTYPE, ST, DT, D_MIN, D_MAX) \
}
#define H5T_CONV_fF(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
@@ -5019,7 +5019,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_schar_llong
*
- * Purpose: Converts `signed char' to `long_long'
+ * Purpose: Converts `signed char' to `long long'
*
* Return: Success: Non-negative
*
@@ -5042,7 +5042,7 @@ H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_schar_llong, FAIL)
- H5T_CONV_sS(SCHAR, LLONG, signed char, long_long, -, -);
+ H5T_CONV_sS(SCHAR, LLONG, signed char, long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5052,7 +5052,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_schar_ullong
*
- * Purpose: Converts `signed char' to `unsigned long_long'
+ * Purpose: Converts `signed char' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -5075,7 +5075,7 @@ H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_schar_ullong, FAIL)
- H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long_long, -, -);
+ H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5085,7 +5085,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_uchar_llong
*
- * Purpose: Converts `unsigned char' to `long_long'
+ * Purpose: Converts `unsigned char' to `long long'
*
* Return: Success: Non-negative
*
@@ -5108,7 +5108,7 @@ H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_uchar_llong, FAIL)
- H5T_CONV_uS(UCHAR, LLONG, unsigned char, long_long, -, LLONG_MAX);
+ H5T_CONV_uS(UCHAR, LLONG, unsigned char, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5118,7 +5118,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_uchar_ullong
*
- * Purpose: Converts `unsigned char' to `unsigned long_long'
+ * Purpose: Converts `unsigned char' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -5141,7 +5141,7 @@ H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_uchar_ullong, FAIL)
- H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long_long, -, -);
+ H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5613,7 +5613,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_short_llong
*
- * Purpose: Converts `short' to `long_long'
+ * Purpose: Converts `short' to `long long'
*
* Return: Success: Non-negative
*
@@ -5636,7 +5636,7 @@ H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_short_llong, FAIL)
- H5T_CONV_sS(SHORT, LLONG, short, long_long, -, -);
+ H5T_CONV_sS(SHORT, LLONG, short, long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5646,7 +5646,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_short_ullong
*
- * Purpose: Converts `short' to `unsigned long_long'
+ * Purpose: Converts `short' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -5669,7 +5669,7 @@ H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_short_ullong, FAIL)
- H5T_CONV_sU(SHORT, ULLONG, short, unsigned long_long, -, -);
+ H5T_CONV_sU(SHORT, ULLONG, short, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5679,7 +5679,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ushort_llong
*
- * Purpose: Converts `unsigned short' to `long_long'
+ * Purpose: Converts `unsigned short' to `long long'
*
* Return: Success: Non-negative
*
@@ -5702,7 +5702,7 @@ H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ushort_llong, FAIL)
- H5T_CONV_uS(USHORT, LLONG, unsigned short, long_long, -, LLONG_MAX);
+ H5T_CONV_uS(USHORT, LLONG, unsigned short, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -5712,7 +5712,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ushort_ullong
*
- * Purpose: Converts `unsigned short' to `unsigned long_long'
+ * Purpose: Converts `unsigned short' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -5735,7 +5735,7 @@ H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ushort_ullong, FAIL)
- H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long_long, -, -);
+ H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6201,7 +6201,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_int_llong
*
- * Purpose: Converts `int' to `long_long'
+ * Purpose: Converts `int' to `long long'
*
* Return: Success: Non-negative
*
@@ -6223,7 +6223,7 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_int_llong, FAIL)
- H5T_CONV_sS(INT, LLONG, int, long_long, -, -);
+ H5T_CONV_sS(INT, LLONG, int, long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6233,7 +6233,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_int_ullong
*
- * Purpose: Converts `int' to `unsigned long_long'
+ * Purpose: Converts `int' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -6255,7 +6255,7 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_int_ullong, FAIL)
- H5T_CONV_sU(INT, ULLONG, int, unsigned long_long, -, -);
+ H5T_CONV_sU(INT, ULLONG, int, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6265,7 +6265,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_uint_llong
*
- * Purpose: Converts `unsigned int' to `long_long'
+ * Purpose: Converts `unsigned int' to `long long'
*
* Return: Success: Non-negative
*
@@ -6287,7 +6287,7 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_uint_llong, FAIL)
- H5T_CONV_uS(UINT, LLONG, unsigned, long_long, -, LLONG_MAX);
+ H5T_CONV_uS(UINT, LLONG, unsigned, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6297,7 +6297,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_uint_ullong
*
- * Purpose: Converts `unsigned int' to `unsigned long_long'
+ * Purpose: Converts `unsigned int' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -6320,7 +6320,7 @@ H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_uint_ullong, FAIL)
- H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long_long, -, -);
+ H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6782,7 +6782,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_long_llong
*
- * Purpose: Converts `long' to `long_long'
+ * Purpose: Converts `long' to `long long'
*
* Return: Success: Non-negative
*
@@ -6804,7 +6804,7 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL)
- H5T_CONV_sS(LONG, LLONG, long, long_long, -, -);
+ H5T_CONV_sS(LONG, LLONG, long, long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6814,7 +6814,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_long_ullong
*
- * Purpose: Converts `long' to `unsigned long_long'
+ * Purpose: Converts `long' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -6837,7 +6837,7 @@ H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_long_ullong, FAIL)
- H5T_CONV_sU(LONG, ULLONG, long, unsigned long_long, -, -);
+ H5T_CONV_sU(LONG, ULLONG, long, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6847,7 +6847,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ulong_llong
*
- * Purpose: Converts `unsigned long' to `long_long'
+ * Purpose: Converts `unsigned long' to `long long'
*
* Return: Success: Non-negative
*
@@ -6870,7 +6870,7 @@ H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ulong_llong, FAIL)
- H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, -, LLONG_MAX);
+ H5T_CONV_uS(ULONG, LLONG, unsigned long, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6880,7 +6880,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ulong_ullong
*
- * Purpose: Converts `unsigned long' to `unsigned long_long'
+ * Purpose: Converts `unsigned long' to `unsigned long long'
*
* Return: Success: Non-negative
*
@@ -6903,7 +6903,7 @@ H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ulong_ullong, FAIL)
- H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long_long, -, -);
+ H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6913,7 +6913,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_schar
*
- * Purpose: Converts `long_long' to `signed char'
+ * Purpose: Converts `long long' to `signed char'
*
* Return: Success: Non-negative
*
@@ -6936,7 +6936,7 @@ H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_schar, FAIL)
- H5T_CONV_Ss(LLONG, SCHAR, long_long, signed char, SCHAR_MIN, SCHAR_MAX);
+ H5T_CONV_Ss(LLONG, SCHAR, long long, signed char, SCHAR_MIN, SCHAR_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6946,7 +6946,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_uchar
*
- * Purpose: Converts `long_long' to `unsigned char'
+ * Purpose: Converts `long long' to `unsigned char'
*
* Return: Success: Non-negative
*
@@ -6969,7 +6969,7 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_uchar, FAIL)
- H5T_CONV_Su(LLONG, UCHAR, long_long, unsigned char, -, UCHAR_MAX);
+ H5T_CONV_Su(LLONG, UCHAR, long long, unsigned char, -, UCHAR_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -6979,7 +6979,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_schar
*
- * Purpose: Converts `unsigned long_long' to `signed char'
+ * Purpose: Converts `unsigned long long' to `signed char'
*
* Return: Success: Non-negative
*
@@ -7002,7 +7002,7 @@ H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_schar, FAIL)
- H5T_CONV_Us(ULLONG, SCHAR, unsigned long_long, signed char, -, SCHAR_MAX);
+ H5T_CONV_Us(ULLONG, SCHAR, unsigned long long, signed char, -, SCHAR_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7012,7 +7012,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_uchar
*
- * Purpose: Converts `unsigned long_long' to `unsigned char'
+ * Purpose: Converts `unsigned long long' to `unsigned char'
*
* Return: Success: Non-negative
*
@@ -7035,7 +7035,7 @@ H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_uchar, FAIL)
- H5T_CONV_Uu(ULLONG, UCHAR, unsigned long_long, unsigned char, -, UCHAR_MAX);
+ H5T_CONV_Uu(ULLONG, UCHAR, unsigned long long, unsigned char, -, UCHAR_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7045,7 +7045,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_short
*
- * Purpose: Converts `long_long' to `short'
+ * Purpose: Converts `long long' to `short'
*
* Return: Success: Non-negative
*
@@ -7068,7 +7068,7 @@ H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_short, FAIL)
- H5T_CONV_Ss(LLONG, SHORT, long_long, short, SHRT_MIN, SHRT_MAX);
+ H5T_CONV_Ss(LLONG, SHORT, long long, short, SHRT_MIN, SHRT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7078,7 +7078,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_ushort
*
- * Purpose: Converts `long_long' to `unsigned short'
+ * Purpose: Converts `long long' to `unsigned short'
*
* Return: Success: Non-negative
*
@@ -7101,7 +7101,7 @@ H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_ushort, FAIL)
- H5T_CONV_Su(LLONG, USHORT, long_long, unsigned short, -, USHRT_MAX);
+ H5T_CONV_Su(LLONG, USHORT, long long, unsigned short, -, USHRT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7111,7 +7111,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_short
*
- * Purpose: Converts `unsigned long_long' to `short'
+ * Purpose: Converts `unsigned long long' to `short'
*
* Return: Success: Non-negative
*
@@ -7134,7 +7134,7 @@ H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_short, FAIL)
- H5T_CONV_Us(ULLONG, SHORT, unsigned long_long, short, -, SHRT_MAX);
+ H5T_CONV_Us(ULLONG, SHORT, unsigned long long, short, -, SHRT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7144,7 +7144,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_ushort
*
- * Purpose: Converts `unsigned long_long' to `unsigned short'
+ * Purpose: Converts `unsigned long long' to `unsigned short'
*
* Return: Success: Non-negative
*
@@ -7167,7 +7167,7 @@ H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_ushort, FAIL)
- H5T_CONV_Uu(ULLONG, USHORT, unsigned long_long, unsigned short, -, USHRT_MAX);
+ H5T_CONV_Uu(ULLONG, USHORT, unsigned long long, unsigned short, -, USHRT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7177,7 +7177,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_int
*
- * Purpose: Converts `long_long' to `int'
+ * Purpose: Converts `long long' to `int'
*
* Return: Success: Non-negative
*
@@ -7199,7 +7199,7 @@ H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_int, FAIL)
- H5T_CONV_Ss(LLONG, INT, long_long, int, INT_MIN, INT_MAX);
+ H5T_CONV_Ss(LLONG, INT, long long, int, INT_MIN, INT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7209,7 +7209,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_uint
*
- * Purpose: Converts `long_long' to `unsigned int'
+ * Purpose: Converts `long long' to `unsigned int'
*
* Return: Success: Non-negative
*
@@ -7231,7 +7231,7 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_uint, FAIL)
- H5T_CONV_Su(LLONG, UINT, long_long, unsigned, -, UINT_MAX);
+ H5T_CONV_Su(LLONG, UINT, long long, unsigned, -, UINT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7241,7 +7241,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_int
*
- * Purpose: Converts `unsigned long_long' to `int'
+ * Purpose: Converts `unsigned long long' to `int'
*
* Return: Success: Non-negative
*
@@ -7263,7 +7263,7 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_int, FAIL)
- H5T_CONV_Us(ULLONG, INT, unsigned long_long, int, -, INT_MAX);
+ H5T_CONV_Us(ULLONG, INT, unsigned long long, int, -, INT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7273,7 +7273,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_uint
*
- * Purpose: Converts `unsigned long_long' to `unsigned int'
+ * Purpose: Converts `unsigned long long' to `unsigned int'
*
* Return: Success: Non-negative
*
@@ -7296,7 +7296,7 @@ H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_uint, FAIL)
- H5T_CONV_Uu(ULLONG, UINT, unsigned long_long, unsigned, -, UINT_MAX);
+ H5T_CONV_Uu(ULLONG, UINT, unsigned long long, unsigned, -, UINT_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7306,7 +7306,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_long
*
- * Purpose: Converts `long_long' to `long'
+ * Purpose: Converts `long long' to `long'
*
* Return: Success: Non-negative
*
@@ -7328,7 +7328,7 @@ H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_long, FAIL)
- H5T_CONV_Ss(LLONG, LONG, long_long, long, LONG_MIN, LONG_MAX);
+ H5T_CONV_Ss(LLONG, LONG, long long, long, LONG_MIN, LONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7338,7 +7338,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_ulong
*
- * Purpose: Converts `long_long' to `unsigned long'
+ * Purpose: Converts `long long' to `unsigned long'
*
* Return: Success: Non-negative
*
@@ -7361,7 +7361,7 @@ H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_ulong, FAIL)
- H5T_CONV_Su(LLONG, ULONG, long_long, unsigned long, -, ULONG_MAX);
+ H5T_CONV_Su(LLONG, ULONG, long long, unsigned long, -, ULONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7371,7 +7371,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_long
*
- * Purpose: Converts `unsigned long_long' to `long'
+ * Purpose: Converts `unsigned long long' to `long'
*
* Return: Success: Non-negative
*
@@ -7394,7 +7394,7 @@ H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_long, FAIL)
- H5T_CONV_Us(ULLONG, LONG, unsigned long_long, long, -, LONG_MAX);
+ H5T_CONV_Us(ULLONG, LONG, unsigned long long, long, -, LONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7404,7 +7404,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_ulong
*
- * Purpose: Converts `unsigned long_long' to `unsigned long'
+ * Purpose: Converts `unsigned long long' to `unsigned long'
*
* Return: Success: Non-negative
*
@@ -7427,7 +7427,7 @@ H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_ulong, FAIL)
- H5T_CONV_Uu(ULLONG, ULONG, unsigned long_long, unsigned long, -, ULONG_MAX);
+ H5T_CONV_Uu(ULLONG, ULONG, unsigned long long, unsigned long, -, ULONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7437,7 +7437,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_llong_ullong
*
- * Purpose: Converts `long_long' to `unsigned long_long'
+ * Purpose: Converts `long long' to `unsigned long long'
*
* Return: Success: non-negative
*
@@ -7460,7 +7460,7 @@ H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_ullong, FAIL)
- H5T_CONV_su(LLONG, ULLONG, long_long, unsigned long_long, -, -);
+ H5T_CONV_su(LLONG, ULLONG, long long, unsigned long long, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -7470,7 +7470,7 @@ done:
/*-------------------------------------------------------------------------
* Function: H5T_conv_ullong_llong
*
- * Purpose: Converts `unsigned long_long' to `long_long'
+ * Purpose: Converts `unsigned long long' to `long long'
*
* Return: Success: non-negative
*
@@ -7493,7 +7493,7 @@ H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_llong, FAIL)
- H5T_CONV_us(ULLONG, LLONG, unsigned long_long, long_long, -, LLONG_MAX);
+ H5T_CONV_us(ULLONG, LLONG, unsigned long long, long long, -, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8529,7 +8529,7 @@ H5T_conv_llong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_float, FAIL)
- H5T_CONV_xF(LLONG, FLOAT, long_long, float, -, -);
+ H5T_CONV_xF(LLONG, FLOAT, long long, float, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8561,7 +8561,7 @@ H5T_conv_llong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_double, FAIL)
- H5T_CONV_xF(LLONG, DOUBLE, long_long, double, -, -);
+ H5T_CONV_xF(LLONG, DOUBLE, long long, double, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8594,7 +8594,7 @@ H5T_conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_llong_ldouble, FAIL)
- H5T_CONV_xF(LLONG, LDOUBLE, long_long, long double, -, -);
+ H5T_CONV_xF(LLONG, LDOUBLE, long long, long double, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8628,7 +8628,7 @@ H5T_conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_float, FAIL)
- H5T_CONV_xF(ULLONG, FLOAT, unsigned long_long, float, -, -);
+ H5T_CONV_xF(ULLONG, FLOAT, unsigned long long, float, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8662,7 +8662,7 @@ H5T_conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_double, FAIL)
- H5T_CONV_xF(ULLONG, DOUBLE, unsigned long_long, double, -, -);
+ H5T_CONV_xF(ULLONG, DOUBLE, unsigned long long, double, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -8696,7 +8696,7 @@ H5T_conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ullong_ldouble, FAIL)
- H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long_long, long double, -, -);
+ H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long long, long double, -, -);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9514,7 +9514,7 @@ H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_float_llong, FAIL)
- H5T_CONV_Fx(FLOAT, LLONG, float, long_long, LLONG_MIN, LLONG_MAX);
+ H5T_CONV_Fx(FLOAT, LLONG, float, long long, LLONG_MIN, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9548,7 +9548,7 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_float_ullong, FAIL)
- H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long_long, 0, ULLONG_MAX);
+ H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9582,7 +9582,7 @@ H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_double_llong, FAIL)
- H5T_CONV_Fx(DOUBLE, LLONG, double, long_long, LLONG_MIN, LLONG_MAX);
+ H5T_CONV_Fx(DOUBLE, LLONG, double, long long, LLONG_MIN, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9616,7 +9616,7 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_double_ullong, FAIL)
- H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long_long, 0, ULLONG_MAX);
+ H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9650,7 +9650,7 @@ H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ldouble_llong, FAIL)
- H5T_CONV_Fx(LDOUBLE, LLONG, long double, long_long, LLONG_MIN, LLONG_MAX);
+ H5T_CONV_Fx(LDOUBLE, LLONG, long double, long long, LLONG_MIN, LLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
@@ -9684,7 +9684,7 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
FUNC_ENTER_NOAPI(H5T_conv_ldouble_ullong, FAIL)
- H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long_long, 0, ULLONG_MAX);
+ H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX);
done:
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index f347d93..75b5d03 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -550,22 +550,22 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
native_size = sizeof(long);
} else if(prec<=H5Tget_precision(H5T_NATIVE_LLONG)) {
match=H5T_NATIVE_INT_MATCH_LLONG;
- native_size = sizeof(long_long);
+ native_size = sizeof(long long);
} else { /* If no native type matches the querried datatype, simply choose the type of biggest size. */
match=H5T_NATIVE_INT_MATCH_LLONG;
- native_size = sizeof(long_long);
+ native_size = sizeof(long long);
}
} else if(direction == H5T_DIR_DESCEND) {
if(prec>=H5Tget_precision(H5T_NATIVE_LLONG)) {
match=H5T_NATIVE_INT_MATCH_LLONG;
- native_size = sizeof(long_long);
+ native_size = sizeof(long long);
} else if(prec>=H5Tget_precision(H5T_NATIVE_LONG)) {
if(prec==H5Tget_precision(H5T_NATIVE_LONG)) {
match=H5T_NATIVE_INT_MATCH_LONG;
native_size = sizeof(long);
} else {
match=H5T_NATIVE_INT_MATCH_LLONG;
- native_size = sizeof(long_long);
+ native_size = sizeof(long long);
}
}
else if(prec>=H5Tget_precision(H5T_NATIVE_INT)) {
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 95539ab..330a731 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -388,7 +388,7 @@ H5_DLLVAR hid_t H5T_VAX_F64_g;
* precision and byte order as the last component, they have a C-like type
* name. If the type begins with `U' then it is the unsigned version of the
* integer type; other integer types are signed. The type LLONG corresponds
- * to C's `long_long' and LDOUBLE is `long double' (these types might be the
+ * to C's `long long' and LDOUBLE is `long double' (these types might be the
* same as `LONG' and `DOUBLE' respectively).
*/
#define H5T_NATIVE_CHAR (CHAR_MIN?H5T_NATIVE_SCHAR:H5T_NATIVE_UCHAR)
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index 28d8f93..10618c3 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -50,19 +50,19 @@ static herr_t H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t spac
static size_t H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts,
const unsigned cd_values[], size_t nbytes, size_t *buf_size, void **buf);
static void H5Z_scaleoffset_convert(void *buf, unsigned d_nelmts, size_t dtype_size);
-static unsigned H5Z_scaleoffset_log2(unsigned long_long num);
+static unsigned H5Z_scaleoffset_log2(unsigned long long num);
static void H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts,
enum H5Z_scaleoffset_type type, unsigned filavail, const void *filval_buf,
- uint32_t *minbits, unsigned long_long *minval);
+ uint32_t *minbits, unsigned long long *minval);
static void H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts,
enum H5Z_scaleoffset_type type, unsigned filavail, const void *filval_buf,
- uint32_t minbits, unsigned long_long minval);
+ uint32_t minbits, unsigned long long minval);
static herr_t H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts,
enum H5Z_scaleoffset_type type, unsigned filavail, const void *filval_buf,
- uint32_t *minbits, unsigned long_long *minval, double D_val);
+ uint32_t *minbits, unsigned long long *minval, double D_val);
static herr_t H5Z_scaleoffset_postdecompress_fd(void *data, unsigned d_nelmts,
enum H5Z_scaleoffset_type type, unsigned filavail, const void *filval_buf,
- uint32_t minbits, unsigned long_long minval, double D_val);
+ uint32_t minbits, unsigned long long minval, double D_val);
static void H5Z_scaleoffset_next_byte(size_t *j, int *buf_len);
static void H5Z_scaleoffset_decompress_one_byte(unsigned char *data, size_t data_offset,
int k, int begin_i, unsigned char *buffer, size_t *j, int *buf_len,
@@ -188,8 +188,8 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_save_filval(unsigned int, cd_values, *(int *)&fill_val) \
else if(sizeof(type) == sizeof(long)) \
H5Z_scaleoffset_save_filval(unsigned long, cd_values, *(long *)&fill_val) \
- else if(sizeof(type) == sizeof(long_long)) \
- H5Z_scaleoffset_save_filval(unsigned long_long, cd_values, *(long_long *)&fill_val)\
+ else if(sizeof(type) == sizeof(long long)) \
+ H5Z_scaleoffset_save_filval(unsigned long long, cd_values, *(long long *)&fill_val)\
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
}
@@ -216,8 +216,8 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_get_filval_1(i, int, filval_buf, *(int *)&filval) \
else if(sizeof(type)==sizeof(long)) \
H5Z_scaleoffset_get_filval_1(i, long, filval_buf, *(long *)&filval) \
- else if(sizeof(type)==sizeof(long_long)) \
- H5Z_scaleoffset_get_filval_1(i, long_long, filval_buf, *(long_long *)&filval) \
+ else if(sizeof(type)==sizeof(long long)) \
+ H5Z_scaleoffset_get_filval_1(i, long long, filval_buf, *(long long *)&filval) \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
}
@@ -303,10 +303,10 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
> HDpow(2.0, (double)(sizeof(long)*8 - 1))) { \
*minbits = sizeof(long)*8; goto done; \
} \
- } else if(sizeof(type)==sizeof(long_long)) { \
+ } else if(sizeof(type)==sizeof(long long)) { \
if(H5Z_scaleoffset_rnd(max*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)) \
- > HDpow(2.0, (double)(sizeof(long_long)*8 - 1))) { \
- *minbits = sizeof(long_long)*8; goto done; \
+ > HDpow(2.0, (double)(sizeof(long long)*8 - 1))) { \
+ *minbits = sizeof(long long)*8; goto done; \
} \
} else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
@@ -323,7 +323,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min) \
H5Z_scaleoffset_check_1(type, max, min, minbits) \
span = max - min + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)(span+1)); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1)); \
} else /* minbits already set, only calculate min */ \
H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min) \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
@@ -334,7 +334,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min) \
H5Z_scaleoffset_check_1(type, max, min, minbits) \
span = max - min + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)span); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)span); \
} else /* minbits already set, only calculate min */ \
H5Z_scaleoffset_min_2(i, d_nelmts, buf, min) \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
@@ -355,7 +355,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_max_min_1(i, d_nelmts, buf, filval, max, min) \
H5Z_scaleoffset_check_2(type, max, min, minbits) \
span = max - min + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)(span+1)); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1)); \
} else /* minbits already set, only calculate min */ \
H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min) \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
@@ -366,7 +366,7 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min) \
H5Z_scaleoffset_check_2(type, max, min, minbits) \
span = max - min + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)span); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)span); \
} else /* minbits already set, only calculate min */ \
H5Z_scaleoffset_min_2(i, d_nelmts, buf, min) \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
@@ -394,12 +394,12 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
*(long *)&buf[i] = H5Z_scaleoffset_rnd( \
buf[i]*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)); \
} \
- else if(sizeof(type)==sizeof(long_long)) \
+ else if(sizeof(type)==sizeof(long long)) \
for(i = 0; i < d_nelmts; i++) { \
if(HDfabs(buf[i] - filval) < HDpow(10.0, -D_val)) \
- *(long_long *)&buf[i] = ((unsigned long_long)1 << *minbits) - 1; \
+ *(long long *)&buf[i] = ((unsigned long long)1 << *minbits) - 1; \
else \
- *(long_long *)&buf[i] = H5Z_scaleoffset_rnd( \
+ *(long long *)&buf[i] = H5Z_scaleoffset_rnd( \
buf[i]*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)); \
} \
else \
@@ -417,9 +417,9 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
for(i = 0; i < d_nelmts; i++) \
*(long *)&buf[i] = H5Z_scaleoffset_rnd( \
buf[i]*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)); \
- else if(sizeof(type)==sizeof(long_long)) \
+ else if(sizeof(type)==sizeof(long long)) \
for(i = 0; i < d_nelmts; i++) \
- *(long_long *)&buf[i] = H5Z_scaleoffset_rnd( \
+ *(long long *)&buf[i] = H5Z_scaleoffset_rnd( \
buf[i]*HDpow(10.0, D_val) - min*HDpow(10.0, D_val)); \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
@@ -434,9 +434,9 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
else if(sizeof(type)==sizeof(long)) \
for(i = 0; i < sizeof(long); i++) \
((unsigned char *)minval)[i] = (unsigned char)((*(long *)&min & ((long)0xff << i*8)) >> i*8); \
- else if(sizeof(type)==sizeof(long_long)) \
- for(i = 0; i < sizeof(long_long); i++) \
- ((unsigned char *)minval)[i] = (unsigned char)((*(long_long *)&min & ((long_long)0xff << i*8)) >> i*8);\
+ else if(sizeof(type)==sizeof(long long)) \
+ for(i = 0; i < sizeof(long long); i++) \
+ ((unsigned char *)minval)[i] = (unsigned char)((*(long long *)&min & ((long long)0xff << i*8)) >> i*8);\
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
}
@@ -446,21 +446,21 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
minbits, minval, D_val) \
{ \
type *buf = data, min = 0, max = 0, filval = 0; \
- unsigned long_long span; unsigned i; *minval = 0; \
+ unsigned long long span; unsigned i; *minval = 0; \
\
if(filavail == H5Z_SCALEOFFSET_FILL_DEFINED) { /* fill value defined */ \
H5Z_scaleoffset_get_filval_2(i, type, filval_buf, filval) \
H5Z_scaleoffset_max_min_3(i, d_nelmts, buf, filval, max, min, D_val) \
H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val) \
span = H5Z_scaleoffset_rnd(max*HDpow(10.0,D_val) - min*HDpow(10.0,D_val)) + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)(span+1)); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1)); \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
H5Z_scaleoffset_modify_1(i, type, buf, d_nelmts, filval, minbits, min, D_val) \
} else { /* fill value undefined */ \
H5Z_scaleoffset_max_min_2(i, d_nelmts, buf, max, min) \
H5Z_scaleoffset_check_3(i, type, max, min, minbits, D_val) \
span = H5Z_scaleoffset_rnd(max*HDpow(10.0,D_val) - min*HDpow(10.0,D_val)) + 1; \
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)span); \
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)span); \
if(*minbits != sizeof(type)*8) /* change values if minbits != full precision */ \
H5Z_scaleoffset_modify_2(i, type, buf, d_nelmts, min, D_val) \
} \
@@ -506,10 +506,10 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
for(i = 0; i < sizeof(long); i++) { \
mask = ((unsigned char *)&minval)[i]; mask <<= i*8; *(long *)&min |= mask; \
} \
- } else if(sizeof(type)==sizeof(long_long)) { \
- long_long mask; \
- for(i = 0; i < sizeof(long_long); i++) { \
- mask = ((unsigned char *)&minval)[i]; mask <<= i*8; *(long_long *)&min |= mask;\
+ } else if(sizeof(type)==sizeof(long long)) { \
+ long long mask; \
+ for(i = 0; i < sizeof(long long); i++) { \
+ mask = ((unsigned char *)&minval)[i]; mask <<= i*8; *(long long *)&min |= mask;\
} \
} else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype")\
@@ -526,10 +526,10 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
for(i = 0; i < d_nelmts; i++) \
buf[i] = (*(long *)&buf[i]==(((unsigned long)1 << minbits) - 1))? \
filval:(*(long *)&buf[i])/HDpow(10.0, D_val) + min; \
- else if(sizeof(type)==sizeof(long_long)) \
+ else if(sizeof(type)==sizeof(long long)) \
for(i = 0; i < d_nelmts; i++) \
- buf[i] = (*(long_long *)&buf[i]==(((unsigned long_long)1 << minbits) - 1))? \
- filval:(*(long_long *)&buf[i])/HDpow(10.0, D_val) + min; \
+ buf[i] = (*(long long *)&buf[i]==(((unsigned long long)1 << minbits) - 1))? \
+ filval:(*(long long *)&buf[i])/HDpow(10.0, D_val) + min; \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
}
@@ -543,9 +543,9 @@ H5Z_class_t H5Z_SCALEOFFSET[1] = {{
else if(sizeof(type)==sizeof(long)) \
for(i = 0; i < d_nelmts; i++) \
buf[i] = (*(long *)&buf[i])/HDpow(10.0, D_val) + min; \
- else if(sizeof(type)==sizeof(long_long)) \
+ else if(sizeof(type)==sizeof(long long)) \
for(i = 0; i < d_nelmts; i++) \
- buf[i] = (*(long_long *)&buf[i])/HDpow(10.0, D_val) + min; \
+ buf[i] = (*(long long *)&buf[i])/HDpow(10.0, D_val) + min; \
else \
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot find matched integer dataype") \
}
@@ -651,7 +651,7 @@ H5Z_scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dty
else if(dtype_size == sizeof(unsigned short)) type = t_ushort;
else if(dtype_size == sizeof(unsigned int)) type = t_uint;
else if(dtype_size == sizeof(unsigned long)) type = t_ulong;
- else if(dtype_size == sizeof(unsigned long_long)) type = t_ulong_long;
+ else if(dtype_size == sizeof(unsigned long long)) type = t_ulong_long;
else
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
}
@@ -661,7 +661,7 @@ H5Z_scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dty
else if(dtype_size == sizeof(short)) type = t_short;
else if(dtype_size == sizeof(int)) type = t_int;
else if(dtype_size == sizeof(long)) type = t_long;
- else if(dtype_size == sizeof(long_long)) type = t_long_long;
+ else if(dtype_size == sizeof(long long)) type = t_long_long;
else
HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, t_bad, "cannot find matched memory dataype")
}
@@ -713,7 +713,7 @@ H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist,
else if(scale_type == t_ulong)
H5Z_scaleoffset_set_filval_1(unsigned long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_ulong_long)
- H5Z_scaleoffset_set_filval_1(unsigned long_long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
+ H5Z_scaleoffset_set_filval_1(unsigned long long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_schar)
H5Z_scaleoffset_set_filval_3(signed char, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_short)
@@ -723,7 +723,7 @@ H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist,
else if(scale_type == t_long)
H5Z_scaleoffset_set_filval_2(long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_long_long)
- H5Z_scaleoffset_set_filval_2(long_long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
+ H5Z_scaleoffset_set_filval_2(long long, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_float)
H5Z_scaleoffset_set_filval_4(float, dcpl_plist, type, cd_values, need_convert, dxpl_id)
else if(scale_type == t_double)
@@ -920,7 +920,7 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu
int scale_factor = 0; /* scale factor */
double D_val = 0.0; /* decimal scale factor */
uint32_t minbits = 0; /* minimum number of bits to store values */
- unsigned long_long minval= 0; /* minimum value of input buffer */
+ unsigned long long minval= 0; /* minimum value of input buffer */
enum H5Z_scaleoffset_type type; /* memory type corresponding to dataset datatype */
int need_convert = FALSE; /* flag indicating convertion of byte order */
unsigned char *outbuf = NULL; /* pointer to new output buffer */
@@ -1009,7 +1009,7 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu
* retrieve them corresponding to how they are stored during compression
*/
uint32_t minbits_mask = 0;
- unsigned long_long minval_mask = 0;
+ unsigned long long minval_mask = 0;
unsigned minval_size = 0;
minbits = 0;
@@ -1020,11 +1020,11 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu
}
/* retrieval of minval takes into consideration situation where sizeof
- * unsigned long_long (datatype of minval) may change from compression
+ * unsigned long long (datatype of minval) may change from compression
* to decompression, only smaller size is used
*/
- minval_size = sizeof(unsigned long_long) <= ((unsigned char *)*buf)[4] ?
- sizeof(unsigned long_long) : ((unsigned char *)*buf)[4];
+ minval_size = sizeof(unsigned long long) <= ((unsigned char *)*buf)[4] ?
+ sizeof(unsigned long long) : ((unsigned char *)*buf)[4];
minval = 0;
for(i = 0; i < minval_size; i++) {
minval_mask = ((unsigned char *)*buf)[5+i];
@@ -1129,10 +1129,10 @@ H5Z_filter_scaleoffset (unsigned flags, size_t cd_nelmts, const unsigned cd_valu
for(i = 0; i < 4; i++)
((unsigned char *)outbuf)[i] = (minbits & ((uint32_t)0xff << i*8)) >> i*8;
- ((unsigned char *)outbuf)[4] = sizeof(unsigned long_long);
+ ((unsigned char *)outbuf)[4] = sizeof(unsigned long long);
- for(i = 0; i < sizeof(unsigned long_long); i++)
- ((unsigned char *)outbuf)[5+i] = (unsigned char)((minval & ((unsigned long_long)0xff << i*8)) >> i*8);
+ for(i = 0; i < sizeof(unsigned long long); i++)
+ ((unsigned char *)outbuf)[5+i] = (unsigned char)((minval & ((unsigned long long)0xff << i*8)) >> i*8);
/* special case: minbits equal to full precision */
if(minbits == p.size * 8) {
@@ -1221,11 +1221,11 @@ static double H5Z_scaleoffset_rnd(double val)
/* return ceiling of floating-point log2 function
* receive unsigned integer as argument 3/10/2005
*/
-static unsigned H5Z_scaleoffset_log2(unsigned long_long num)
+static unsigned H5Z_scaleoffset_log2(unsigned long long num)
{
unsigned v = 0;
- unsigned long_long lower_bound = 1; /* is power of 2, largest value <= num */
- unsigned long_long val = num;
+ unsigned long long lower_bound = 1; /* is power of 2, largest value <= num */
+ unsigned long long val = num;
while(val >>= 1) { v++; lower_bound <<= 1; }
@@ -1236,7 +1236,7 @@ static unsigned H5Z_scaleoffset_log2(unsigned long_long num)
/* precompress for integer type */
static void
H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_type type,
- unsigned filavail, const void *filval_buf, uint32_t *minbits, unsigned long_long *minval)
+ unsigned filavail, const void *filval_buf, uint32_t *minbits, unsigned long long *minval)
{
if(type == t_uchar)
H5Z_scaleoffset_precompress_1(unsigned char, data, d_nelmts,
@@ -1251,7 +1251,7 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse
H5Z_scaleoffset_precompress_1(unsigned long, data, d_nelmts,
filavail, filval_buf, minbits, minval)
else if(type == t_ulong_long)
- H5Z_scaleoffset_precompress_1(unsigned long_long, data, d_nelmts,
+ H5Z_scaleoffset_precompress_1(unsigned long long, data, d_nelmts,
filavail, filval_buf, minbits, minval)
else if(type == t_schar) {
signed char *buf = data, min = 0, max = 0, filval = 0;
@@ -1264,7 +1264,7 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse
if((unsigned char)(max - min) > (unsigned char)(~(unsigned char)0 - 2))
{ *minbits = sizeof(signed char)*8; return; }
span = max - min + 1;
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)(span+1));
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)(span+1));
} else /* minbits already set, only calculate min */
H5Z_scaleoffset_min_1(i, d_nelmts, buf, filval, min)
if(*minbits != sizeof(signed char)*8) /* change values if minbits != full precision */
@@ -1278,7 +1278,7 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse
*minval = min; return;
}
span = max - min + 1;
- *minbits = H5Z_scaleoffset_log2((unsigned long_long)span);
+ *minbits = H5Z_scaleoffset_log2((unsigned long long)span);
} else /* minbits already set, only calculate min */
H5Z_scaleoffset_min_2(i, d_nelmts, buf, min)
if(*minbits != sizeof(signed char)*8) /* change values if minbits != full precision */
@@ -1296,16 +1296,16 @@ H5Z_scaleoffset_precompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffse
H5Z_scaleoffset_precompress_2(long, data, d_nelmts,
filavail, filval_buf, minbits, minval)
else if(type == t_long_long)
- H5Z_scaleoffset_precompress_2(long_long, data, d_nelmts,
+ H5Z_scaleoffset_precompress_2(long long, data, d_nelmts,
filavail, filval_buf, minbits, minval)
}
/* postdecompress for integer type */
static void
H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_type type,
- unsigned filavail, const void *filval_buf, uint32_t minbits, unsigned long_long minval)
+ unsigned filavail, const void *filval_buf, uint32_t minbits, unsigned long long minval)
{
- long_long sminval = *(long_long*)&minval; /* for signed integer types */
+ long long sminval = *(long long*)&minval; /* for signed integer types */
if(type == t_uchar)
H5Z_scaleoffset_postdecompress_1(unsigned char, data, d_nelmts, filavail,
@@ -1320,7 +1320,7 @@ H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleof
H5Z_scaleoffset_postdecompress_1(unsigned long, data, d_nelmts, filavail,
filval_buf, minbits, minval)
else if(type == t_ulong_long)
- H5Z_scaleoffset_postdecompress_1(unsigned long_long, data, d_nelmts, filavail,
+ H5Z_scaleoffset_postdecompress_1(unsigned long long, data, d_nelmts, filavail,
filval_buf, minbits, minval)
else if(type == t_schar) {
signed char *buf = data, filval = 0; unsigned i;
@@ -1342,7 +1342,7 @@ H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleof
H5Z_scaleoffset_postdecompress_2(long, data, d_nelmts, filavail,
filval_buf, minbits, sminval)
else if(type == t_long_long)
- H5Z_scaleoffset_postdecompress_2(long_long, data, d_nelmts, filavail,
+ H5Z_scaleoffset_postdecompress_2(long long, data, d_nelmts, filavail,
filval_buf, minbits, sminval)
}
@@ -1350,7 +1350,7 @@ H5Z_scaleoffset_postdecompress_i(void *data, unsigned d_nelmts, enum H5Z_scaleof
success: non-negative, failure: negative 4/15/05 */
static herr_t
H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_type type,
-unsigned filavail, const void *filval_buf, uint32_t *minbits, unsigned long_long *minval, double D_val)
+unsigned filavail, const void *filval_buf, uint32_t *minbits, unsigned long long *minval, double D_val)
{
herr_t ret_value=SUCCEED; /* Return value */
@@ -1371,9 +1371,9 @@ done:
success: non-negative, failure: negative 4/15/05 */
static herr_t
H5Z_scaleoffset_postdecompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffset_type type,
-unsigned filavail, const void *filval_buf, uint32_t minbits, unsigned long_long minval, double D_val)
+unsigned filavail, const void *filval_buf, uint32_t minbits, unsigned long long minval, double D_val)
{
- long_long sminval = *(long_long*)&minval; /* for signed integer types */
+ long long sminval = *(long long*)&minval; /* for signed integer types */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5Z_scaleoffset_postdecompress_fd, FAIL)
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index b26a4b3..2b35786 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -193,9 +193,9 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
else if((TYPE) == H5T_NATIVE_ULONG) \
H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_LLONG) \
- H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long_long, OP, (SIZE)) \
+ H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_ULLONG) \
- H5Z_XFORM_ULL_DO_OP1((RESL), (RESR), unsigned long_long, OP, (SIZE)) \
+ H5Z_XFORM_ULL_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_FLOAT) \
H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_DOUBLE) \
@@ -225,9 +225,9 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
else if((TYPE) == H5T_NATIVE_ULONG) \
H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_LLONG) \
- H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long_long, OP, (SIZE)) \
+ H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_ULLONG) \
- H5Z_XFORM_ULL_DO_OP1((RESL), (RESR), unsigned long_long, OP, (SIZE)) \
+ H5Z_XFORM_ULL_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_FLOAT) \
H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE)) \
else if((TYPE) == H5T_NATIVE_DOUBLE) \
@@ -942,9 +942,9 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size
else if(array_type == H5T_NATIVE_ULONG)
H5Z_XFORM_DO_OP5(unsigned long, array_size)
else if(array_type == H5T_NATIVE_LLONG)
- H5Z_XFORM_DO_OP5(long_long, array_size)
+ H5Z_XFORM_DO_OP5(long long, array_size)
else if(array_type == H5T_NATIVE_ULLONG)
- H5Z_XFORM_DO_OP5(unsigned long_long, array_size)
+ H5Z_XFORM_DO_OP5(unsigned long long, array_size)
else if(array_type == H5T_NATIVE_FLOAT)
H5Z_XFORM_DO_OP5(float, array_size)
else if(array_type == H5T_NATIVE_DOUBLE)
diff --git a/src/H5detect.c b/src/H5detect.c
index e29157d..b67c2b0 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -1396,8 +1396,8 @@ detect_C99_integers64(void)
#endif
#if H5_SIZEOF_LONG_LONG>0
- DETECT_I(long_long, LLONG, d_g[nd_g]); nd_g++;
- DETECT_I(unsigned long_long, ULLONG, d_g[nd_g]); nd_g++;
+ DETECT_I(long long, LLONG, d_g[nd_g]); nd_g++;
+ DETECT_I(unsigned long long, ULLONG, d_g[nd_g]); nd_g++;
#else
/*
* This architecture doesn't support an integer type larger than `long'
diff --git a/src/H5private.h b/src/H5private.h
index 2f75f86..ea55a61 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -404,12 +404,12 @@
* most part.
*/
#ifndef LLONG_MAX
-# define LLONG_MAX ((long_long)(((unsigned long_long)1 \
- <<(8*sizeof(long_long)-1))-1))
-# define LLONG_MIN ((long_long)(-LLONG_MAX)-1)
+# define LLONG_MAX ((long long)(((unsigned long long)1 \
+ <<(8*sizeof(long long)-1))-1))
+# define LLONG_MIN ((long long)(-LLONG_MAX)-1)
#endif
#ifndef ULLONG_MAX
-# define ULLONG_MAX ((unsigned long_long)((long_long)(-1)))
+# define ULLONG_MAX ((unsigned long long)((long long)(-1)))
#endif
#ifndef SIZET_MAX
# define SIZET_MAX ((size_t)(ssize_t)(-1))
diff --git a/src/H5public.h b/src/H5public.h
index 0697b92..e13091b 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -110,24 +110,6 @@ typedef int herr_t;
typedef unsigned int hbool_t;
typedef int htri_t;
-/*
- * Although `long long' is part of the revised ANSI-C some compilers don't
- * support it yet. We define `long_long' as the longest integral integer type
- * supported by the compiler, usually 64 bits. It must be legal to qualify
- * `long_long' with `unsigned'.
- */
-#if H5_SIZEOF_LONG_LONG>0
-# define long_long long long
-#elif H5_SIZEOF___INT64>0
-# define long_long __int64 /*Win32*/
-# undef H5_SIZEOF_LONG_LONG
-# define H5_SIZEOF_LONG_LONG H5_SIZEOF___INT64
-#else
-# define long_long long int
-# undef H5_SIZEOF_LONG_LONG
-# define H5_SIZEOF_LONG_LONG H5_SIZEOF_LONG
-#endif
-
/* Define the ssize_t type if it not is defined */
#if H5_SIZEOF_SSIZE_T==0
/* Undefine this size, we will re-define it in one of the sections below */
@@ -139,7 +121,7 @@ typedef int ssize_t;
typedef long ssize_t;
# define H5_SIZEOF_SSIZE_T H5_SIZEOF_LONG
#elif H5_SIZEOF_SIZE_T==H5_SIZEOF_LONG_LONG
-typedef long_long ssize_t;
+typedef long long ssize_t;
# define H5_SIZEOF_SSIZE_T H5_SIZEOF_LONG_LONG
#else /* Can't find matching type for ssize_t */
# error "nothing appropriate for ssize_t"
@@ -151,8 +133,8 @@ typedef long_long ssize_t;
* type.
*/
#if H5_SIZEOF_LONG_LONG >= 8
-typedef unsigned long_long hsize_t;
-typedef signed long_long hssize_t;
+typedef unsigned long long hsize_t;
+typedef signed long long hssize_t;
# define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG
# define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
#else
@@ -184,8 +166,8 @@ typedef signed long_long hssize_t;
# define HADDR_AS_MPI_TYPE MPI_UNSIGNED_LONG
# endif /* H5_HAVE_PARALLEL */
#elif H5_SIZEOF_LONG_LONG>=8
- typedef unsigned long_long haddr_t;
-# define HADDR_UNDEF ((haddr_t)(long_long)(-1))
+ typedef unsigned long long haddr_t;
+# define HADDR_UNDEF ((haddr_t)(long long)(-1))
# define H5_SIZEOF_HADDR_T H5_SIZEOF_LONG_LONG
# ifdef H5_HAVE_PARALLEL
# define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT
@@ -237,7 +219,7 @@ typedef signed long_long hssize_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG
#elif H5_SIZEOF_LONG_LONG>=8
- typedef long_long int64_t;
+ typedef long long int64_t;
# undef H5_SIZEOF_INT64_T
# define H5_SIZEOF_INT64_T H5_SIZEOF_LONG_LONG
#else
@@ -257,7 +239,7 @@ typedef signed long_long hssize_t;
# undef H5_SIZEOF_UINT64_T
# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG
#elif H5_SIZEOF_LONG_LONG>=8
- typedef unsigned long_long uint64_t;
+ typedef unsigned long long uint64_t;
# undef H5_SIZEOF_UINT64_T
# define H5_SIZEOF_UINT64_T H5_SIZEOF_LONG_LONG
#else
diff --git a/test/big.c b/test/big.c
index 3cef154..8176929 100644
--- a/test/big.c
+++ b/test/big.c
@@ -38,7 +38,7 @@ const char *FILENAME[] = {
#define MAX_TRIES 100
#if H5_SIZEOF_LONG_LONG >= 8
-# define GB8LL ((unsigned long_long)8*1024*1024*1024)
+# define GB8LL ((unsigned long long)8*1024*1024*1024)
#else
# define GB8LL 0 /*cannot do the test*/
#endif
@@ -53,7 +53,7 @@ static hsize_t values_used[WRT_N];
/*-------------------------------------------------------------------------
* Function: randll
*
- * Purpose: Create a random long_long value.
+ * Purpose: Create a random long long value.
* Ensures that a write at this value doesn't overlap any
* previous write.
*
@@ -577,8 +577,8 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
* because we would generate multi-gigabyte files.
*/
puts("Checking if file system is adequate for this test...");
- if (sizeof(long_long)<8 || 0==GB8LL) {
- puts("Test skipped because sizeof(long_long) is too small. This");
+ if (sizeof(long long)<8 || 0==GB8LL) {
+ puts("Test skipped because sizeof(long long) is too small. This");
puts("hardware apparently doesn't support 64-bit integer types.");
usage();
goto quit;
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index d1f317f..53c63d7 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -116,7 +116,7 @@ typedef struct {
float f, g, h[16], i, j;
double k, l, m, n;
long o, p, q;
- long_long r, s, t;
+ long long r, s, t;
} stype4;
#define NX 100u
diff --git a/test/dsets.c b/test/dsets.c
index a5257fe..3d1dfd3 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -2604,11 +2604,11 @@ test_nbit_int(hid_t file)
if((dataset = H5Dcreate2(file, DSET_NBIT_INT_NAME, datatype,
space, H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
- /* Initialize data, assuming size of long_long >= size of int */
+ /* Initialize data, assuming size of long long >= size of int */
for(i= 0;i< (size_t)size[0]; i++)
for(j = 0; j < (size_t)size[1]; j++) {
- orig_data[i][j] = (int)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision - 1))) << offset);
+ orig_data[i][j] = (int)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision - 1))) << offset);
/* even-numbered values are negtive */
if((i*size[1]+j+1)%2 == 0)
@@ -2914,7 +2914,7 @@ test_nbit_double(hid_t file)
goto error;
/* Check that the values read are the same as the values written
- * Assume size of long_long = size of double
+ * Assume size of long long = size of double
*/
for(i=0; i<(size_t)size[0]; i++) {
for(j=0; j<(size_t)size[1]; j++) {
@@ -3016,13 +3016,13 @@ test_nbit_array(hid_t file)
if((dataset = H5Dcreate2(file, DSET_NBIT_ARRAY_NAME, array_datatype,
space, H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
- /* Initialize data, assuming size of long_long >= size of unsigned int */
+ /* Initialize data, assuming size of long long >= size of unsigned int */
for(i= 0;i< (size_t)size[0]; i++)
for(j = 0; j < (size_t)size[1]; j++)
for(m = 0; m < (size_t)adims[0]; m++)
for(n = 0; n < (size_t)adims[1]; n++)
- orig_data[i][j][m][n] = (unsigned int)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)precision)) << offset);
+ orig_data[i][j][m][n] = (unsigned int)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)precision)) << offset);
PASSED();
#else
SKIPPED();
@@ -3198,15 +3198,15 @@ test_nbit_compound(hid_t file)
if((dataset = H5Dcreate2(file, DSET_NBIT_COMPOUND_NAME, cmpd_tid,
space, H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
- /* Initialize data, assuming size of long_long >= size of member datatypes */
+ /* Initialize data, assuming size of long long >= size of member datatypes */
for(i= 0;i< (size_t)size[0]; i++)
for(j = 0; j < (size_t)size[1]; j++) {
- orig_data[i][j].i = (int)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
- orig_data[i][j].c = (char)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
- orig_data[i][j].s = (short)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
+ orig_data[i][j].i = (int)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
+ orig_data[i][j].c = (char)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
+ orig_data[i][j].s = (short)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
orig_data[i][j].f = float_val[i][j];
/* some even-numbered integer values are negtive */
@@ -3445,33 +3445,33 @@ test_nbit_compound_2(hid_t file)
if((dataset = H5Dcreate2(file, DSET_NBIT_COMPOUND_NAME_2, cmpd_tid2,
space, H5P_DEFAULT, dc, H5P_DEFAULT)) < 0) goto error;
- /* Initialize data, assuming size of long_long >= size of member datatypes */
+ /* Initialize data, assuming size of long long >= size of member datatypes */
for(i= 0;i< (size_t)size[0]; i++)
for(j = 0; j < (size_t)size[1]; j++) {
- orig_data[i][j].a.i = (int)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
- orig_data[i][j].a.c = (char)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
- orig_data[i][j].a.s = (short)(-((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
+ orig_data[i][j].a.i = (int)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
+ orig_data[i][j].a.c = (char)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
+ orig_data[i][j].a.s = (short)(-((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
orig_data[i][j].a.f = float_val[i][j];
- orig_data[i][j].v = (unsigned int)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)precision[3])) << offset[3]);
+ orig_data[i][j].v = (unsigned int)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)precision[3])) << offset[3]);
for(m = 0; m < (size_t)array_dims[0]; m++)
for(n = 0; n < (size_t)array_dims[1]; n++)
- orig_data[i][j].b[m][n] = (char)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[4]-1))) << offset[4]);
+ orig_data[i][j].b[m][n] = (char)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[4]-1))) << offset[4]);
for(m = 0; m < (size_t)array_dims[0]; m++)
for(n = 0; n < (size_t)array_dims[1]; n++) {
- orig_data[i][j].d[m][n].i = (int)(-((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
- orig_data[i][j].d[m][n].c = (char)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
- orig_data[i][j].d[m][n].s = (short)(((long_long)HDrandom() %
- (long_long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
+ orig_data[i][j].d[m][n].i = (int)(-((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[0]-1))) << offset[0]);
+ orig_data[i][j].d[m][n].c = (char)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[1]-1))) << offset[1]);
+ orig_data[i][j].d[m][n].s = (short)(((long long)HDrandom() %
+ (long long)HDpow(2.0, (double)(precision[2]-1))) << offset[2]);
orig_data[i][j].d[m][n].f = float_val[i][j];
}
}
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 67885a3..e507fd0 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -1668,8 +1668,8 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
unsigned hw_uint;
long hw_long;
unsigned long hw_ulong;
- long_long hw_llong;
- unsigned long_long hw_ullong;
+ long long hw_llong;
+ unsigned long long hw_ullong;
/* What are the names of the source and destination types */
if (H5Tequal(src, H5T_NATIVE_SCHAR)) {
@@ -1766,7 +1766,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
dst_nbits = H5Tget_precision(dst); /* not 8*dst_size, esp on J90 - QAK */
src_sign = H5Tget_sign(src);
dst_sign = H5Tget_sign(dst);
- aligned = HDcalloc(1, sizeof(long_long));
+ aligned = HDcalloc(1, sizeof(long long));
/* Allocate and initialize the source buffer through macro INIT_INTEGER. The BUF
* will be used for the conversion while the SAVED buffer will be
@@ -1789,9 +1789,9 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
} else if(src_type == INT_ULONG) {
INIT_INTEGER(unsigned long, ULONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
} else if(src_type == INT_LLONG) {
- INIT_INTEGER(long_long, LLONG_MAX, LLONG_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);
+ INIT_INTEGER(long long, LLONG_MAX, LLONG_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);
} else if(src_type == INT_ULLONG) {
- INIT_INTEGER(unsigned long_long, ULLONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
+ INIT_INTEGER(unsigned long long, ULLONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
} else
goto error;
@@ -1837,12 +1837,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw_char = (signed char)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_char = (signed char)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_char = (signed char)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_char = (signed char)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_char = (signed char)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -1883,12 +1883,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw_uchar = (unsigned char)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_uchar = (unsigned char)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_uchar = (unsigned char)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_uchar = (unsigned char)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_uchar = (unsigned char)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -1929,12 +1929,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw_short = (short)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_short = (short)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_short = (short)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_short = (short)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_short = (short)(*((unsigned long long*)aligned));
break;
default:
@@ -1976,12 +1976,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw_ushort = (unsigned short)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_ushort = (unsigned short)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_ushort = (unsigned short)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_ushort = (unsigned short)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_ushort = (unsigned short)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -2022,12 +2022,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw_int = (int)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_int = (int)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_int = (int)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_int = (int)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_int = (int)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -2068,12 +2068,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw_uint = (unsigned int)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_uint = (unsigned int)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_uint = (unsigned int)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_uint = (unsigned int)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_uint = (unsigned int)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -2114,12 +2114,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw_long = (long int)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_long = (long int)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_long = (long int)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_long = (long int)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_long = (long int)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -2160,12 +2160,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
hw_ulong = (unsigned long)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_ulong = (unsigned long)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_ulong = (unsigned long)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_ulong = (unsigned long)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_ulong = (unsigned long)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -2175,43 +2175,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
switch (src_type) {
case INT_SCHAR:
HDmemcpy(aligned, saved+j*sizeof(char), sizeof(char));
- hw_llong = (long_long)(*((char*)aligned));
+ hw_llong = (long long)(*((char*)aligned));
break;
case INT_UCHAR:
HDmemcpy(aligned, saved+j*sizeof(unsigned char), sizeof(unsigned char));
- hw_llong = (long_long)(*((unsigned char*)aligned));
+ hw_llong = (long long)(*((unsigned char*)aligned));
break;
case INT_SHORT:
HDmemcpy(aligned, saved+j*sizeof(short), sizeof(short));
- hw_llong = (long_long)(*((short*)aligned));
+ hw_llong = (long long)(*((short*)aligned));
break;
case INT_USHORT:
HDmemcpy(aligned, saved+j*sizeof(unsigned short), sizeof(unsigned short));
- hw_llong = (long_long)(*((unsigned short*)aligned));
+ hw_llong = (long long)(*((unsigned short*)aligned));
break;
case INT_INT:
HDmemcpy(aligned, saved+j*sizeof(int), sizeof(int));
- hw_llong = (long_long)(*((int*)aligned));
+ hw_llong = (long long)(*((int*)aligned));
break;
case INT_UINT:
HDmemcpy(aligned, saved+j*sizeof(unsigned), sizeof(unsigned));
- hw_llong = (long_long)(*((unsigned*)aligned));
+ hw_llong = (long long)(*((unsigned*)aligned));
break;
case INT_LONG:
HDmemcpy(aligned, saved+j*sizeof(long), sizeof(long));
- hw_llong = (long_long)(*((long*)aligned));
+ hw_llong = (long long)(*((long*)aligned));
break;
case INT_ULONG:
HDmemcpy(aligned, saved+j*sizeof(unsigned long), sizeof(unsigned long));
- hw_llong = (long_long)(*((unsigned long*)aligned));
+ hw_llong = (long long)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_llong = (long_long)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_llong = (long long)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_llong = (long_long)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_llong = (long long)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -2221,43 +2221,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
switch (src_type) {
case INT_SCHAR:
HDmemcpy(aligned, saved+j*sizeof(signed char), sizeof(signed char));
- hw_ullong = (unsigned long_long)(*((signed char*)aligned));
+ hw_ullong = (unsigned long long)(*((signed char*)aligned));
break;
case INT_UCHAR:
HDmemcpy(aligned, saved+j*sizeof(unsigned char), sizeof(unsigned char));
- hw_ullong = (unsigned long_long)(*((unsigned char*)aligned));
+ hw_ullong = (unsigned long long)(*((unsigned char*)aligned));
break;
case INT_SHORT:
HDmemcpy(aligned, saved+j*sizeof(short), sizeof(short));
- hw_ullong = (unsigned long_long)(*((short*)aligned));
+ hw_ullong = (unsigned long long)(*((short*)aligned));
break;
case INT_USHORT:
HDmemcpy(aligned, saved+j*sizeof(unsigned short), sizeof(unsigned short));
- hw_ullong = (unsigned long_long)(*((unsigned short*)aligned));
+ hw_ullong = (unsigned long long)(*((unsigned short*)aligned));
break;
case INT_INT:
HDmemcpy(aligned, saved+j*sizeof(int), sizeof(int));
- hw_ullong = (unsigned long_long)(*((int*)aligned));
+ hw_ullong = (unsigned long long)(*((int*)aligned));
break;
case INT_UINT:
HDmemcpy(aligned, saved+j*sizeof(unsigned), sizeof(unsigned));
- hw_ullong = (unsigned long_long)(*((unsigned*)aligned));
+ hw_ullong = (unsigned long long)(*((unsigned*)aligned));
break;
case INT_LONG:
HDmemcpy(aligned, saved+j*sizeof(long), sizeof(long));
- hw_ullong = (unsigned long_long)(*((long*)aligned));
+ hw_ullong = (unsigned long long)(*((long*)aligned));
break;
case INT_ULONG:
HDmemcpy(aligned, saved+j*sizeof(unsigned long), sizeof(unsigned long));
- hw_ullong = (unsigned long_long)(*((unsigned long*)aligned));
+ hw_ullong = (unsigned long long)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_ullong = (unsigned long_long)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_ullong = (unsigned long long)(*((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_ullong = (unsigned long_long)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_ullong = (unsigned long long)(*((unsigned long long*)aligned));
break;
default:
break;
@@ -2426,12 +2426,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
printf(" %29lu\n", *((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)aligned));
break;
default:
break;
@@ -2475,12 +2475,12 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
printf(" %29lu\n", *((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, buf+j*sizeof(long_long), sizeof(long_long));
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+ HDmemcpy(aligned, buf+j*sizeof(long long), sizeof(long long));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, buf+j*sizeof(long_long), sizeof(unsigned long_long));
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned));
+ HDmemcpy(aligned, buf+j*sizeof(long long), sizeof(unsigned long long));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)aligned));
break;
default:
break;
@@ -2516,10 +2516,10 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
printf(" %29lu\n", *((unsigned long*)hw));
break;
case INT_LLONG:
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)hw));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)hw));
break;
case INT_ULLONG:
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)hw));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)hw));
break;
default:
break;
@@ -3478,8 +3478,8 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
unsigned hw_uint=0;
long hw_long=0;
unsigned long hw_ulong=0;
- long_long hw_llong=0;
- unsigned long_long hw_ullong=0;
+ long long hw_llong=0;
+ unsigned long long hw_ullong=0;
/* What is the name of the source type */
if (H5Tequal(src, H5T_NATIVE_SCHAR)) {
@@ -3650,7 +3650,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
dst_size = H5Tget_size(dst);
src_nbits = H5Tget_precision(src); /* not 8*src_size, esp on J90 - QAK */
dst_nbits = H5Tget_precision(dst); /* not 8*dst_size, esp on J90 - QAK */
- aligned = HDcalloc(1, MAX(sizeof(long double), sizeof(long_long)));
+ aligned = HDcalloc(1, MAX(sizeof(long double), sizeof(long long)));
#ifdef SHOW_OVERFLOWS
noverflows_g = 0;
#endif
@@ -3707,9 +3707,9 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
} else if(src_type == INT_ULONG) {
INIT_INTEGER(unsigned long, ULONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
} else if(src_type == INT_LLONG) {
- INIT_INTEGER(long_long, LLONG_MAX, LLONG_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);
+ INIT_INTEGER(long long, LLONG_MAX, LLONG_MIN, src_size, dst_size, src_nbits, buf, saved, nelmts);
} else if(src_type == INT_ULLONG) {
- INIT_INTEGER(unsigned long_long, ULLONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
+ INIT_INTEGER(unsigned long long, ULLONG_MAX, 0, src_size, dst_size, src_nbits, buf, saved, nelmts);
} else if(src_type == FLT_FLOAT) {
if(run_test==TEST_NORMAL) {
INIT_FP_NORM(float, FLT_MAX, FLT_MIN, FLT_MAX_10_EXP, FLT_MIN_10_EXP,
@@ -3795,13 +3795,13 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
hw_float = (float)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_float = (float)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_float = (float)(*((long long*)aligned));
break;
#ifdef H5_ULLONG_TO_FP_CAST_WORKS
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_float = (float)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_float = (float)(*((unsigned long long*)aligned));
break;
#endif /* H5_ULLONG_TO_FP_CAST_WORKS */
default:
@@ -3843,13 +3843,13 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
hw_double = (double)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_double = (double)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_double = (double)(*((long long*)aligned));
break;
#ifdef H5_ULLONG_TO_FP_CAST_WORKS
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_double = (double)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_double = (double)(*((unsigned long long*)aligned));
break;
#endif /* H5_ULLONG_TO_FP_CAST_WORKS */
default:
@@ -3892,13 +3892,13 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
hw_ldouble = (long double)(*((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- hw_ldouble = (long double)(*((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ hw_ldouble = (long double)(*((long long*)aligned));
break;
#ifdef H5_ULLONG_TO_FP_CAST_WORKS
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- hw_ldouble = (long double)(*((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ hw_ldouble = (long double)(*((unsigned long long*)aligned));
break;
#endif /* H5_ULLONG_TO_FP_CAST_WORKS */
default:
@@ -4070,16 +4070,16 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
switch (src_type) {
case FLT_FLOAT:
HDmemcpy(aligned, saved+j*sizeof(float), sizeof(float));
- hw_llong = (long_long)(*((float*)aligned));
+ hw_llong = (long long)(*((float*)aligned));
break;
case FLT_DOUBLE:
HDmemcpy(aligned, saved+j*sizeof(double), sizeof(double));
- hw_llong = (long_long)(*((double*)aligned));
+ hw_llong = (long long)(*((double*)aligned));
break;
#if H5_SIZEOF_LONG_DOUBLE !=0
case FLT_LDOUBLE:
HDmemcpy(aligned, saved+j*sizeof(long double), sizeof(long double));
- hw_llong = (long_long)(*((long double*)aligned));
+ hw_llong = (long long)(*((long double*)aligned));
break;
#endif
default:
@@ -4090,16 +4090,16 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
switch (src_type) {
case FLT_FLOAT:
HDmemcpy(aligned, saved+j*sizeof(float), sizeof(float));
- hw_ullong = (unsigned long_long)(*((float*)aligned));
+ hw_ullong = (unsigned long long)(*((float*)aligned));
break;
case FLT_DOUBLE:
HDmemcpy(aligned, saved+j*sizeof(double), sizeof(double));
- hw_ullong = (unsigned long_long)(*((double*)aligned));
+ hw_ullong = (unsigned long long)(*((double*)aligned));
break;
#if H5_SIZEOF_LONG_DOUBLE !=0
case FLT_LDOUBLE:
HDmemcpy(aligned, saved+j*sizeof(long double), sizeof(long double));
- hw_ullong = (unsigned long_long)(*((long double*)aligned));
+ hw_ullong = (unsigned long long)(*((long double*)aligned));
break;
#endif
default:
@@ -4258,10 +4258,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
if((tmp_s+1)==tmp_h || (tmp_s-1)==tmp_h)
continue; /*no error*/
} /* end if */
- else if (dst_size==sizeof(unsigned long_long)) {
- unsigned long_long tmp_s, tmp_h;
- HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long_long));
- HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long_long));
+ else if (dst_size==sizeof(unsigned long long)) {
+ unsigned long long tmp_s, tmp_h;
+ HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long long));
+ HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long long));
if((tmp_s+1)==tmp_h || (tmp_s-1)==tmp_h)
continue; /*no error*/
} /* end if */
@@ -4273,9 +4273,9 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
*/
#ifndef H5_FP_TO_ULLONG_BOTTOM_BIT_WORKS
if((src_type==FLT_FLOAT || src_type==FLT_DOUBLE) && dst_type==INT_ULLONG) {
- unsigned long_long tmp_s, tmp_h;
- HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long_long));
- HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long_long));
+ unsigned long long tmp_s, tmp_h;
+ HDmemcpy(&tmp_s,&buf[j*dst_size],sizeof(unsigned long long));
+ HDmemcpy(&tmp_h,&hw[0],sizeof(unsigned long long));
if((tmp_s+1)==tmp_h)
continue; /*no error*/
}
@@ -4347,12 +4347,12 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
printf(" %29lu\n", *((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, saved+j*sizeof(long_long), sizeof(long_long));
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(long long), sizeof(long long));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, saved+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned));
+ HDmemcpy(aligned, saved+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)aligned));
break;
case FLT_FLOAT:
HDmemcpy(aligned, saved+j*sizeof(float), sizeof(float));
@@ -4410,12 +4410,12 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
printf(" %29lu\n", *((unsigned long*)aligned));
break;
case INT_LLONG:
- HDmemcpy(aligned, buf+j*sizeof(long_long), sizeof(long_long));
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)aligned));
+ HDmemcpy(aligned, buf+j*sizeof(long long), sizeof(long long));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)aligned));
break;
case INT_ULLONG:
- HDmemcpy(aligned, buf+j*sizeof(unsigned long_long), sizeof(unsigned long_long));
- HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)aligned));
+ HDmemcpy(aligned, buf+j*sizeof(unsigned long long), sizeof(unsigned long long));
+ HDfprintf(stdout," %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)aligned));
break;
case FLT_FLOAT:
HDmemcpy(aligned, buf+j*sizeof(float), sizeof(float));
@@ -4465,10 +4465,10 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst)
printf(" %29lu\n", *((unsigned long*)hw));
break;
case INT_LLONG:
- printf(" %29"H5_PRINTF_LL_WIDTH"d\n", *((long_long*)hw));
+ printf(" %29"H5_PRINTF_LL_WIDTH"d\n", *((long long*)hw));
break;
case INT_ULLONG:
- printf(" %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long_long*)hw));
+ printf(" %29"H5_PRINTF_LL_WIDTH"u\n", *((unsigned long long*)hw));
break;
case FLT_FLOAT:
printf(" %29f\n", *((float*)hw));
diff --git a/test/dtransform.c b/test/dtransform.c
index c5a4fa8..3297fe6 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -265,14 +265,14 @@ int main(void)
TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0);
#ifdef H5_LLONG_TO_FP_CAST_WORKS
- TEST_TYPE_CONTIG(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
+ TEST_TYPE_CONTIG(dxpl_id_c_to_f, long long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
#else
TESTING("contiguous, with type conversion (float->llong)")
SKIPPED()
#endif
#ifdef H5_ULLONG_TO_FP_CAST_WORKS
- TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long_long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
+ TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
#else
TESTING("contiguous, with type conversion (float->ullong)")
SKIPPED()
@@ -293,14 +293,14 @@ int main(void)
TEST_TYPE_CHUNK(dxpl_id_c_to_f, long, H5T_NATIVE_LONG, "long", windchillFfloat, 1);
TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0);
#ifdef H5_LLONG_TO_FP_CAST_WORKS
- TEST_TYPE_CHUNK(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
+ TEST_TYPE_CHUNK(dxpl_id_c_to_f, long long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
#else
TESTING("chunked, with type conversion (float->llong)")
SKIPPED()
#endif
#ifdef H5_ULLONG_TO_FP_CAST_WORKS
- TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long_long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
+ TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
#else
TESTING("chunked, with type conversion (float->ullong)")
SKIPPED()
diff --git a/test/earray.c b/test/earray.c
index 6935a15..7b68e95 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -2381,14 +2381,14 @@ main(void)
nelmts = (hsize_t)(1 + cparam.idx_blk_elmts +
tparam.sblk_info[sblk].start_idx +
(tparam.sblk_info[sblk].dblk_nelmts * dblk));
- sprintf(test_str, "setting first element of array's data block #%llu", (unsigned long_long)ndblks);
+ sprintf(test_str, "setting first element of array's data block #%llu", (unsigned long long)ndblks);
nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str);
/* Test all elements in data block */
nelmts = (hsize_t)(cparam.idx_blk_elmts +
tparam.sblk_info[sblk].start_idx +
(tparam.sblk_info[sblk].dblk_nelmts * (dblk + 1)));
- sprintf(test_str, "setting all elements of array's data block #%llu", (unsigned long_long)ndblks);
+ sprintf(test_str, "setting all elements of array's data block #%llu", (unsigned long long)ndblks);
nerrors += test_set_elmts(fapl, &cparam, &tparam, nelmts, test_str);
/* Increment data block being tested */
diff --git a/test/ntypes.c b/test/ntypes.c
index c8e7ccd..a82f051 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -284,7 +284,7 @@ test_compound_dtype2(hid_t file)
char c;
int i;
s2 st;
- unsigned long_long l;
+ unsigned long long l;
} s1;
hid_t dataset, space;
hid_t dtype, native_type, tid, tid2, tid_m, tid_m2,
@@ -310,7 +310,7 @@ test_compound_dtype2(hid_t file)
temp_point->i = n++;
temp_point->st.c2 = (short)(i + j);
temp_point->st.l2 = (i * 5 + j * 50) * n;
- temp_point->l = (unsigned long_long)((i * 10 + j * 100) * n);
+ temp_point->l = (unsigned long long)((i * 10 + j * 100) * n);
}
}
@@ -531,7 +531,7 @@ test_compound_dtype(hid_t file)
typedef struct {
char c;
unsigned int i;
- long_long l;
+ long long l;
} s1;
hid_t dataset, space;
hid_t dtype, native_type, tid, tid2, mem_id;
@@ -703,7 +703,7 @@ test_compound_dtype3(hid_t file)
typedef struct {
char c;
int a[5];
- long_long l;
+ long long l;
} s1;
hid_t dataset, space;
hid_t dtype, native_type, tid, tid2, tid_m, tid_m2,
@@ -902,7 +902,7 @@ test_compound_opaque(hid_t file)
typedef struct {
char c;
unsigned char o[5];
- long_long l;
+ long long l;
} s1;
hid_t dataset, space;
hid_t dtype, native_type, tid, tid2, tid_m,
@@ -1218,7 +1218,7 @@ test_array_dtype(hid_t file)
typedef struct {
char c;
int i;
- long_long l;
+ long long l;
} s1;
hid_t dataset, space;
hid_t dtype, native_type, tid, tid2, tid3, tid_m;
diff --git a/test/tconfig.c b/test/tconfig.c
index d4d7d4b..355191d 100644
--- a/test/tconfig.c
+++ b/test/tconfig.c
@@ -127,7 +127,7 @@ test_config_ctypes(void)
/* standard C99 basic types */
#if H5_SIZEOF_LONG_LONG > 0
- vrfy_cint_type(long_long, unsigned long_long, H5_SIZEOF_LONG_LONG);
+ vrfy_cint_type(long long, unsigned long long, H5_SIZEOF_LONG_LONG);
#endif
#if H5_SIZEOF_INT8_T > 0
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 141c96f..d9495e5 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -43,7 +43,7 @@
#define FILE11 "h5diff_empty.h5"
#define UIMAX 4294967295u /*Maximum value for a variable of type unsigned int */
#define STR_SIZE 3
-#define GBLL ((unsigned long_long) 1024 * 1024 *1024 )
+#define GBLL ((unsigned long long) 1024 * 1024 *1024 )
#define MY_LINKCLASS 187
@@ -202,12 +202,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
/*-------------------------------------------------------------------------
* relative error, compare divide by zero, both zero
- * # 1.6.2 with -p (unsigned long_long)
+ * # 1.6.2 with -p (unsigned long long)
*-------------------------------------------------------------------------
*/
{
- unsigned long_long data7[3][2] = {{100,100},{100,0},{0,100}};
- unsigned long_long data8[3][2] = {{120,80}, {0,100},{0,50}};
+ unsigned long long data7[3][2] = {{100,100},{100,0},{0,100}};
+ unsigned long long data8[3][2] = {{120,80}, {0,100},{0,50}};
write_dset(gid1,2,dims2,"dset7",H5T_NATIVE_ULLONG,data7);
write_dset(gid1,2,dims2,"dset8",H5T_NATIVE_ULLONG,data8);
@@ -575,11 +575,11 @@ int test_datatypes(const char *fname)
char buf7a[3][2] = {{-1,-128},{-1,-1},{-1,-1}};
unsigned char buf7b[3][2] = {{1,128},{1,1},{1,1}};
- /* long_long test */
- long_long buf8a[3][2] = {{1,1},{1,1},{1,1}};
- long_long buf8b[3][2] = {{1,1},{3,4},{5,6}};
- unsigned long_long buf9a[3][2] = {{1,1},{1,1},{1,1}};
- unsigned long_long buf9b[3][2] = {{1,1},{3,4},{5,6}};
+ /* long long test */
+ long long buf8a[3][2] = {{1,1},{1,1},{1,1}};
+ long long buf8b[3][2] = {{1,1},{3,4},{5,6}};
+ unsigned long long buf9a[3][2] = {{1,1},{1,1},{1,1}};
+ unsigned long long buf9b[3][2] = {{1,1},{3,4},{5,6}};
unsigned int buf10a[3][2] = {{UIMAX,1},{1,1},{1,1}};
unsigned int buf10b[3][2] = {{UIMAX-1,1},{3,4},{5,6}};
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 19a26b4..600de9b 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -3065,9 +3065,9 @@ dump_fcpl(hid_t fid)
indentation(indent + COL);
printf("%s %u\n","OBJECTHEADER_VERSION", shhdr);
indentation(indent + COL);
- HDfprintf(stdout,"%s %Hd\n","OFFSET_SIZE", (long_long)off_size);
+ HDfprintf(stdout,"%s %Hd\n","OFFSET_SIZE", (long long)off_size);
indentation(indent + COL);
- HDfprintf(stdout,"%s %Hd\n","LENGTH_SIZE", (long_long)len_size);
+ HDfprintf(stdout,"%s %Hd\n","LENGTH_SIZE", (long long)len_size);
indentation(indent + COL);
printf("%s %u\n","BTREE_RANK", sym_ik);
indentation(indent + COL);
@@ -4505,12 +4505,12 @@ print_enum(hid_t type)
/*
* Determine what datatype to use for the native values. To simplify
* things we entertain three possibilities:
- * 1. long_long -- the largest native signed integer
- * 2. unsigned long_long -- the largest native unsigned integer
+ * 1. long long -- the largest native signed integer
+ * 2. unsigned long long -- the largest native unsigned integer
* 3. raw format
*/
- if (H5Tget_size(type) <= sizeof(long_long)) {
- dst_size = sizeof(long_long);
+ if (H5Tget_size(type) <= sizeof(long long)) {
+ dst_size = sizeof(long long);
if (H5T_SGN_NONE == H5Tget_sign(type)) {
native = H5T_NATIVE_ULLONG;
@@ -4556,14 +4556,14 @@ print_enum(hid_t type)
/*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
*strangely, unless use another pointer "copy".*/
copy = value+i*dst_size;
- HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long_long *)
+ HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long long *)
((void *)copy)));
} else {
/*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
*strangely, unless use another pointer "copy".*/
copy = value+i*dst_size;
HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "d",
- *((long_long *) ((void *)copy)));
+ *((long long *) ((void *)copy)));
}
printf(";\n");
@@ -6684,12 +6684,12 @@ xml_print_enum(hid_t type)
/*
* Determine what datatype to use for the native values. To simplify
* things we entertain three possibilities:
- * 1. long_long -- the largest native signed integer
- * 2. unsigned long_long -- the largest native unsigned integer
+ * 1. long long -- the largest native signed integer
+ * 2. unsigned long long -- the largest native unsigned integer
* 3. raw format
*/
- if (H5Tget_size(type) <= sizeof(long_long)) {
- dst_size = sizeof(long_long);
+ if (H5Tget_size(type) <= sizeof(long long)) {
+ dst_size = sizeof(long long);
if (H5T_SGN_NONE == H5Tget_sign(type)) {
native = H5T_NATIVE_ULLONG;
@@ -6737,11 +6737,11 @@ xml_print_enum(hid_t type)
for (j = 0; j < dst_size; j++)
printf("%02x", value[i * dst_size + j]);
} else if (H5T_SGN_NONE == H5Tget_sign(native)) {
- HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long_long *)
+ HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long long *)
((void *) (value + i * dst_size))));
} else {
HDfprintf(stdout,"%" H5_PRINTF_LL_WIDTH "d",
- *((long_long *) ((void *) (value + i * dst_size))));
+ *((long long *) ((void *) (value + i * dst_size))));
}
printf("\n");
indentation(indent);
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 05efda8..3b11eac 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -5608,7 +5608,7 @@ gent_binary(void)
*
*-------------------------------------------------------------------------
*/
-#define GB4LL ((unsigned long_long) 4*1024*1024*1024)
+#define GB4LL ((unsigned long long) 4*1024*1024*1024)
#define DIM_4GB (GB4LL + 10)
static void
diff --git a/tools/h5import/h5import.h b/tools/h5import/h5import.h
index 975ace0..c43b0cf 100755
--- a/tools/h5import/h5import.h
+++ b/tools/h5import/h5import.h
@@ -68,7 +68,7 @@
#define H5DT_UINT8 unsigned char
#define H5DT_UINT16 unsigned short
#define H5DT_UINT32 unsigned int
-#define H5DT_INT64 long_long
+#define H5DT_INT64 long long
#define H5DT_UINT64 unsigned H5DT_INT64
struct path_info
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index 0b0ba9c..718ec6b 100755
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -44,10 +44,10 @@ main(void)
int rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ;
#ifndef WIN32
- long_long b64i2[3][4], b64i3[5][3][4];
- long_long row4i64[3], col4i64[4], pln4i64[5];
- long_long rowo4i64 = (long_long)11 , colo4i64 = (long_long)21 , plno4i64 = (long_long)51 ;
- long_long rowi4i64 = (long_long)1 , coli4i64 = (long_long)2 , plni4i64 = (long_long)5 ;
+ long long b64i2[3][4], b64i3[5][3][4];
+ long long row4i64[3], col4i64[4], pln4i64[5];
+ long long rowo4i64 = (long long)11 , colo4i64 = (long long)21 , plno4i64 = (long long)51 ;
+ long long rowi4i64 = (long long)1 , coli4i64 = (long long)2 , plni4i64 = (long long)5 ;
#endif
short b16i3[5][3][4];
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 0c492d0..ca0ddcb 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -770,11 +770,11 @@ display_enum_type(hid_t type, int ind)
/* Determine what data type to use for the native values. To simplify
* things we entertain three possibilities:
- * 1. long_long -- the largest native signed integer
- * 2. unsigned long_long -- the largest native unsigned integer
+ * 1. long long -- the largest native signed integer
+ * 2. unsigned long long -- the largest native unsigned integer
* 3. raw format */
- if (H5Tget_size(type)<=sizeof(long_long)) {
- dst_size = sizeof(long_long);
+ if (H5Tget_size(type)<=sizeof(long long)) {
+ dst_size = sizeof(long long);
if (H5T_SGN_NONE==H5Tget_sign(type)) {
native = H5T_NATIVE_ULLONG;
} else {
@@ -813,13 +813,13 @@ display_enum_type(hid_t type, int ind)
*strangely, unless use another pointer "copy".*/
copy = value+i*dst_size;
HDfprintf(stdout,"%"H5_PRINTF_LL_WIDTH"u",
- *((unsigned long_long*)((void*)copy)));
+ *((unsigned long long*)((void*)copy)));
} else {
/*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
*strangely, unless use another pointer "copy".*/
copy = value+i*dst_size;
HDfprintf(stdout,"%"H5_PRINTF_LL_WIDTH"d",
- *((long_long*)((void*)copy)));
+ *((long long*)((void*)copy)));
}
}
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index d10bc25..c5f9d69 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -92,7 +92,7 @@ int d_status = EXIT_SUCCESS;
#define CDIM1 DIM1/2
#define CDIM2 DIM2/2
#define RANK 2
-#define GBLL ((unsigned long_long) 1024*1024*1024)
+#define GBLL ((unsigned long long) 1024*1024*1024)
/* Size of userblock (for userblock test) */
#define USERBLOCK_SIZE 2048
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index f9c6261..5d57a52 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -138,7 +138,7 @@ static int not_comparable;
*/
static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id,hid_t region1_id, hid_t region2_id, diff_opt_t *options);
static hbool_t all_zero(const void *_mem, size_t size);
-static int ull2float(unsigned long_long ull_value, float *f_value);
+static int ull2float(unsigned long long ull_value, float *f_value);
static hsize_t character_compare(unsigned char *mem1,unsigned char *mem2,hsize_t i,unsigned u,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
static hbool_t equal_float(float value, float expected, diff_opt_t *options);
@@ -356,9 +356,9 @@ hsize_t diff_array( void *_mem1,
* H5T_COMPOUND
* Recursively call this function for each member
* H5T_ARRAY
- * Recursively call this function for each element 
+ * Recursively call this function for each element�
* H5T_VLEN
- * Recursively call this function for each element 
+ * Recursively call this function for each element�
* H5T_STRING
* compare byte by byte in a cycle from 0 to type_size. this type_size is the
* value obtained by the get_size function but it is the string lenght for
@@ -1588,12 +1588,12 @@ hsize_t diff_datum(void *_mem1,
else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
{
- long_long temp1_llong;
- long_long temp2_llong;
- assert(type_size==sizeof(long_long));
+ long long temp1_llong;
+ long long temp2_llong;
+ assert(type_size==sizeof(long long));
- memcpy(&temp1_llong, mem1, sizeof(long_long));
- memcpy(&temp2_llong, mem2, sizeof(long_long));
+ memcpy(&temp1_llong, mem1, sizeof(long long));
+ memcpy(&temp2_llong, mem2, sizeof(long long));
/* -d and !-p */
if (options->d && !options->p)
{
@@ -1686,16 +1686,16 @@ hsize_t diff_datum(void *_mem1,
else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
{
- unsigned long_long temp1_ullong;
- unsigned long_long temp2_ullong;
- assert(type_size==sizeof(unsigned long_long));
+ unsigned long long temp1_ullong;
+ unsigned long long temp2_ullong;
+ assert(type_size==sizeof(unsigned long long));
- memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
- memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+ memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+ memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
/* -d and !-p */
if (options->d && !options->p)
{
- if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta)
+ if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta)
{
if ( print_data(options) )
{
@@ -1758,7 +1758,7 @@ hsize_t diff_datum(void *_mem1,
else
- if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta )
+ if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta )
{
if ( print_data(options) )
@@ -4777,8 +4777,8 @@ hsize_t diff_llong(unsigned char *mem1,
{
hsize_t nfound=0; /* number of differences found */
- long_long temp1_llong;
- long_long temp2_llong;
+ long long temp1_llong;
+ long long temp2_llong;
hsize_t i;
double per;
int both_zero;
@@ -4789,8 +4789,8 @@ hsize_t diff_llong(unsigned char *mem1,
for ( i = 0; i < nelmts; i++)
{
- memcpy(&temp1_llong, mem1, sizeof(long_long));
- memcpy(&temp2_llong, mem2, sizeof(long_long));
+ memcpy(&temp1_llong, mem1, sizeof(long long));
+ memcpy(&temp2_llong, mem2, sizeof(long long));
if (ABS( temp1_llong-temp2_llong) > options->delta)
{
@@ -4802,8 +4802,8 @@ hsize_t diff_llong(unsigned char *mem1,
}
nfound++;
}
- mem1+=sizeof(long_long);
- mem2+=sizeof(long_long);
+ mem1+=sizeof(long long);
+ mem2+=sizeof(long long);
if (options->n && nfound>=options->count)
return nfound;
}
@@ -4816,8 +4816,8 @@ hsize_t diff_llong(unsigned char *mem1,
for ( i = 0; i < nelmts; i++)
{
- memcpy(&temp1_llong, mem1, sizeof(long_long));
- memcpy(&temp2_llong, mem2, sizeof(long_long));
+ memcpy(&temp1_llong, mem1, sizeof(long long));
+ memcpy(&temp2_llong, mem2, sizeof(long long));
PER(temp1_llong,temp2_llong);
@@ -4844,8 +4844,8 @@ hsize_t diff_llong(unsigned char *mem1,
}
nfound++;
}
- mem1+=sizeof(long_long);
- mem2+=sizeof(long_long);
+ mem1+=sizeof(long long);
+ mem2+=sizeof(long long);
if (options->n && nfound>=options->count)
return nfound;
}
@@ -4859,8 +4859,8 @@ hsize_t diff_llong(unsigned char *mem1,
for ( i = 0; i < nelmts; i++)
{
- memcpy(&temp1_llong, mem1, sizeof(long_long));
- memcpy(&temp2_llong, mem2, sizeof(long_long));
+ memcpy(&temp1_llong, mem1, sizeof(long long));
+ memcpy(&temp2_llong, mem2, sizeof(long long));
PER(temp1_llong,temp2_llong);
@@ -4887,8 +4887,8 @@ hsize_t diff_llong(unsigned char *mem1,
}
nfound++;
}
- mem1+=sizeof(long_long);
- mem2+=sizeof(long_long);
+ mem1+=sizeof(long long);
+ mem2+=sizeof(long long);
if (options->n && nfound>=options->count)
return nfound;
}
@@ -4899,8 +4899,8 @@ hsize_t diff_llong(unsigned char *mem1,
for ( i = 0; i < nelmts; i++)
{
- memcpy(&temp1_llong, mem1, sizeof(long_long));
- memcpy(&temp2_llong, mem2, sizeof(long_long));
+ memcpy(&temp1_llong, mem1, sizeof(long long));
+ memcpy(&temp2_llong, mem2, sizeof(long long));
if (temp1_llong != temp2_llong)
{
@@ -4913,8 +4913,8 @@ hsize_t diff_llong(unsigned char *mem1,
nfound++;
}
- mem1+=sizeof(long_long);
- mem2+=sizeof(long_long);
+ mem1+=sizeof(long long);
+ mem2+=sizeof(long long);
if (options->n && nfound>=options->count)
return nfound;
} /* nelmts */
@@ -4950,8 +4950,8 @@ hsize_t diff_ullong(unsigned char *mem1,
{
hsize_t nfound=0; /* number of differences found */
- unsigned long_long temp1_ullong;
- unsigned long_long temp2_ullong;
+ unsigned long long temp1_ullong;
+ unsigned long long temp2_ullong;
hsize_t i;
float f1, f2;
double per;
@@ -4963,10 +4963,10 @@ hsize_t diff_ullong(unsigned char *mem1,
for ( i = 0; i < nelmts; i++)
{
- memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
- memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+ memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+ memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
- if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long) options->delta)
+ if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long) options->delta)
{
if ( print_data(options) )
{
@@ -4976,8 +4976,8 @@ hsize_t diff_ullong(unsigned char *mem1,
}
nfound++;
}
- mem1+=sizeof(unsigned long_long);
- mem2+=sizeof(unsigned long_long);
+ mem1+=sizeof(unsigned long long);
+ mem2+=sizeof(unsigned long long);
if (options->n && nfound>=options->count)
return nfound;
}
@@ -4990,8 +4990,8 @@ hsize_t diff_ullong(unsigned char *mem1,
for ( i = 0; i < nelmts; i++)
{
- memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
- memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+ memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+ memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
ull2float(temp1_ullong,&f1);
ull2float(temp2_ullong,&f2);
@@ -5020,8 +5020,8 @@ hsize_t diff_ullong(unsigned char *mem1,
}
nfound++;
}
- mem1+=sizeof(unsigned long_long);
- mem2+=sizeof(unsigned long_long);
+ mem1+=sizeof(unsigned long long);
+ mem2+=sizeof(unsigned long long);
if (options->n && nfound>=options->count)
return nfound;
}
@@ -5035,8 +5035,8 @@ hsize_t diff_ullong(unsigned char *mem1,
for ( i = 0; i < nelmts; i++)
{
- memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
- memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+ memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+ memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
ull2float(temp1_ullong,&f1);
ull2float(temp2_ullong,&f2);
@@ -5055,7 +5055,7 @@ hsize_t diff_ullong(unsigned char *mem1,
else
- if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta )
+ if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long long)options->delta )
{
if ( print_data(options) )
{
@@ -5065,8 +5065,8 @@ hsize_t diff_ullong(unsigned char *mem1,
}
nfound++;
}
- mem1+=sizeof(unsigned long_long);
- mem2+=sizeof(unsigned long_long);
+ mem1+=sizeof(unsigned long long);
+ mem2+=sizeof(unsigned long long);
if (options->n && nfound>=options->count)
return nfound;
}
@@ -5077,8 +5077,8 @@ hsize_t diff_ullong(unsigned char *mem1,
for ( i = 0; i < nelmts; i++)
{
- memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
- memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
+ memcpy(&temp1_ullong, mem1, sizeof(unsigned long long));
+ memcpy(&temp2_ullong, mem2, sizeof(unsigned long long));
if (temp1_ullong != temp2_ullong)
{
@@ -5091,8 +5091,8 @@ hsize_t diff_ullong(unsigned char *mem1,
nfound++;
}
- mem1+=sizeof(unsigned long_long);
- mem2+=sizeof(unsigned long_long);
+ mem1+=sizeof(unsigned long long);
+ mem2+=sizeof(unsigned long long);
if (options->n && nfound>=options->count)
return nfound;
} /* nelmts */
@@ -5107,7 +5107,7 @@ hsize_t diff_ullong(unsigned char *mem1,
/*-------------------------------------------------------------------------
* Function: ull2float
*
- * Purpose: convert unsigned long_long to float
+ * Purpose: convert unsigned long long to float
*
* Programmer: pvn
* Mar 22, 2006
@@ -5117,7 +5117,7 @@ hsize_t diff_ullong(unsigned char *mem1,
*-------------------------------------------------------------------------
*/
static
-int ull2float(unsigned long_long ull_value, float *f_value)
+int ull2float(unsigned long long ull_value, float *f_value)
{
hid_t dxpl_id;
unsigned char *buf;
@@ -5573,7 +5573,7 @@ void print_pos( int *ph, /* print header */
parallel_print("[ " );
for ( i = 0; i < rank; i++)
{
- parallel_print(HSIZE_T_FORMAT, (unsigned long_long)pos[i]);
+ parallel_print(HSIZE_T_FORMAT, (unsigned long long)pos[i]);
parallel_print(" ");
}
parallel_print("]" );
@@ -5651,7 +5651,7 @@ void print_char_pos( int *ph, /* print header */
for ( i = 0; i < rank; i++)
{
- parallel_print(HSIZE_T_FORMAT, (unsigned long_long)pos[i]);
+ parallel_print(HSIZE_T_FORMAT, (unsigned long long)pos[i]);
parallel_print(" ");
}
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index 35f4dfb..1acc493 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -371,7 +371,7 @@ get_class(H5T_class_t tclass)
void print_found(hsize_t nfound)
{
if(g_Parallel)
- parallel_print("%"H5_PRINTF_LL_WIDTH"u differences found\n", (unsigned long_long)nfound);
+ parallel_print("%"H5_PRINTF_LL_WIDTH"u differences found\n", (unsigned long long)nfound);
else
HDfprintf(stdout,"%Hu differences found\n",nfound);
}
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 52d65fe..6032c02 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -1559,8 +1559,8 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
size_t size; /* datum size */
float tempfloat;
double tempdouble;
- unsigned long_long tempullong;
- long_long templlong;
+ unsigned long long tempullong;
+ long long templlong;
unsigned long tempulong;
long templong;
unsigned int tempuint;
@@ -1726,7 +1726,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
}
else if (H5Tequal(tid, H5T_NATIVE_LLONG))
{
- memcpy(&templlong, mem, sizeof(long_long));
+ memcpy(&templlong, mem, sizeof(long long));
#ifdef DEBUG_H5DUMP_BIN
fprintf(stream, fmt_llong, templlong);
#else
@@ -1736,7 +1736,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
}
else if (H5Tequal(tid, H5T_NATIVE_ULLONG))
{
- memcpy(&tempullong, mem, sizeof(unsigned long_long));
+ memcpy(&tempullong, mem, sizeof(unsigned long long));
#ifdef DEBUG_H5DUMP_BIN
fprintf(stream, fmt_ullong, tempullong);
#else
@@ -1768,7 +1768,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
}
else
{
- memcpy(&templlong, mem, sizeof(long_long));
+ memcpy(&templlong, mem, sizeof(long long));
#ifdef DEBUG_H5DUMP_BIN
fprintf(stream, fmt_llong, templlong);
#else
@@ -1801,7 +1801,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
}
else
{
- memcpy(&tempullong, mem, sizeof(unsigned long_long));
+ memcpy(&tempullong, mem, sizeof(unsigned long long));
#ifdef DEBUG_H5DUMP_BIN
fprintf(stream, fmt_ullong, tempullong);
#else
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 5d42307..a339acf 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -586,8 +586,8 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
* some tempvars to store the value before we append it to the string to
* get rid of the memory alignment problem
*/
- unsigned long_long tempullong;
- long_long templlong;
+ unsigned long long tempullong;
+ long long templlong;
unsigned long tempulong;
long templong;
unsigned int tempuint;
@@ -737,10 +737,10 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
HDmemcpy(&tempulong, vp, sizeof(unsigned long));
h5tools_str_append(str, OPT(info->fmt_ulong, "%lu"), tempulong);
} else if (H5Tequal(type, H5T_NATIVE_LLONG)) {
- HDmemcpy(&templlong, vp, sizeof(long_long));
+ HDmemcpy(&templlong, vp, sizeof(long long));
h5tools_str_append(str, OPT(info->fmt_llong, fmt_llong), templlong);
} else if (H5Tequal(type, H5T_NATIVE_ULLONG)) {
- HDmemcpy(&tempullong, vp, sizeof(unsigned long_long));
+ HDmemcpy(&tempullong, vp, sizeof(unsigned long long));
h5tools_str_append(str, OPT(info->fmt_ullong, fmt_ullong), tempullong);
} else if (H5Tequal(type, H5T_NATIVE_HSSIZE)) {
if (sizeof(hssize_t) == sizeof(int)) {
@@ -750,7 +750,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
memcpy(&templong, vp, sizeof(long));
h5tools_str_append(str, OPT(info->fmt_long, "%ld"), templong);
} else {
- memcpy(&templlong, vp, sizeof(long_long));
+ memcpy(&templlong, vp, sizeof(long long));
h5tools_str_append(str, OPT(info->fmt_llong, fmt_llong), templlong);
}
} else if (H5Tequal(type, H5T_NATIVE_HSIZE)) {
@@ -761,7 +761,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
memcpy(&tempulong, vp, sizeof(long));
h5tools_str_append(str, OPT(info->fmt_ulong, "%lu"), tempulong);
} else {
- memcpy(&tempullong, vp, sizeof(unsigned long_long));
+ memcpy(&tempullong, vp, sizeof(unsigned long long));
h5tools_str_append(str, OPT(info->fmt_ullong, fmt_ullong), tempullong);
}
} else if (H5Tget_class(type) == H5T_COMPOUND) {