summaryrefslogtreecommitdiffstats
path: root/tools/lib/h5diff_array.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/lib/h5diff_array.c')
-rw-r--r--tools/lib/h5diff_array.c114
1 files changed, 57 insertions, 57 deletions
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(" ");
}
generated by cgit v0.12 at 2024-07-19 23:18:01 (GMT)