diff --git a/.clang-format b/.clang-format index 0b6225579c0..59a9bd479ae 100644 --- a/.clang-format +++ b/.clang-format @@ -11,7 +11,7 @@ BraceWrapping: BreakBeforeBraces: Stroustrup BreakAfterJavaFieldAnnotations: true BreakStringLiterals: true -ColumnLimit: 110 # Update $max_trace_macro_line_len in bin/trace also +ColumnLimit: 110 IndentWidth: 4 --- Language: Cpp @@ -68,12 +68,14 @@ StatementMacros: - CATCH - END_MEMBERS - FUNC_ENTER_API + - FUNC_ENTER_API_NAMECHECK_ONLY - FUNC_ENTER_NOAPI - FUNC_ENTER_NOAPI_NOERR - FUNC_ENTER_NOAPI_NOINIT - FUNC_ENTER_NOAPI_NOINIT_NOERR - FUNC_ENTER_PACKAGE - FUNC_LEAVE_API + - FUNC_LEAVE_API_NAMECHECK_ONLY - FUNC_LEAVE_NOAPI - FUNC_LEAVE_NOAPI_NOFS - H5E_END_TRY diff --git a/autogen.sh b/autogen.sh index 33a82779465..31d117cf8ed 100755 --- a/autogen.sh +++ b/autogen.sh @@ -44,9 +44,8 @@ echo # compilation. # Run trace script -# The trace script adds H5TRACE macros to library source files. It should -# have no effect on files that don't have HDF5 API macros in them. -echo "Running trace script:" +# The trace script updates H5ARG_TRACE macros in library source files. +echo "Running arg trace script:" bin/trace src/H5*.c || exit 1 echo diff --git a/bin/README.md b/bin/README.md index e2e25701893..28559f0ba60 100644 --- a/bin/README.md +++ b/bin/README.md @@ -21,7 +21,7 @@ Programs run via `autogen.sh` (or the equivalent in CMake) are indicated. |`restore.sh`|Removes files generated by `autogen.sh`| |`runbkprog`|Used by CMake to run test programs in the background| |`switch_maint_mode`|Switches maintainer mode on/off in `configure.ac`| -|`trace`|Adds `TRACE` macros to HDF5 C library source files (run by `autogen.sh`)| +|`trace`|Updates `H5ARG_TRACE` macros in H5ES\_insert() calls (run by `autogen.sh`)| |`warnhist`|Generates compiler warning statistics for gcc/clang when fed output of make| ## TODO diff --git a/bin/trace b/bin/trace index 5941f3a89a8..f86b2ee7874 100755 --- a/bin/trace +++ b/bin/trace @@ -10,6 +10,12 @@ # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. ## + +## +# Process H5ARG_TRACE() macros (defined in H5private.h) used in H5ES_insert(), +# updating them with the caller's parameters, etc. +## + require 5.003; use warnings; $Source = ""; @@ -26,6 +32,10 @@ $Source = ""; # Two-character strings begin with an upper-case letter which is # usually the same as the package name. # +# These map to the types in H5trace.c (which should be updated if you add +# a type here), so there are more types listed here than are used by the +# existing macros. +# %TypeString = ("haddr_t" => "a", "H5A_info_t" => "Ai", "H5A_operator1_t" => "Ao", @@ -210,294 +220,180 @@ $Source = ""; "H5VL_request_status_t" => "#", ); - -############################################################################## -# Maximum length of H5TRACE macro line -# If the ColumnLimit in .clang-format is changed, this value will need to be updated -# -my $max_trace_macro_line_len = 110; - - ############################################################################## # Print an error message. # my $found_errors = 0; sub errmesg ($$@) { - my ($file, $func, @mesg) = @_; - my ($mesg) = join "", @mesg; - my ($lineno) = 1; - if ($Source =~ /(.*?\n)($func)/s) { - local $_ = $1; - $lineno = tr/\n/\n/; - } - - $found_errors = 1; - - print "$file: in function \`$func\':\n"; - print "$file:$lineno: $mesg\n"; + my ($file, $func, @mesg) = @_; + my ($mesg) = join "", @mesg; + my ($lineno) = 1; + if ($Source =~ /(.*?\n)($func)/s) { + local $_ = $1; + $lineno = tr/\n/\n/; + } + + $found_errors = 1; + + print "$file: in function \`$func\':\n"; + print "$file:$lineno: $mesg\n"; } ############################################################################## -# Given a C data type return the type string that goes with it. +# Given a C data type, return the type string that goes with it # sub argstring ($$$) { - my ($file, $func, $atype) = @_; - my ($ptr, $tstr, $array) = (0, "!", ""); - my ($fq_atype); - - # Normalize the data type by removing redundant white space, - # certain type qualifiers, and indirection. - $atype =~ s/^\bconst\b//; # Leading const - $atype =~ s/\s*const\s*//; # const after type, possibly in the middle of '*'s - $atype =~ s/^\bstatic\b//; - $atype =~ s/\bH5_ATTR_UNUSED\b//g; - $atype =~ s/\bH5_ATTR_DEPRECATED_USED\b//g; - $atype =~ s/\bH5_ATTR_NDEBUG_UNUSED\b//g; - $atype =~ s/\bH5_ATTR_DEBUG_API_USED\b//g; - $atype =~ s/\bH5_ATTR_PARALLEL_UNUSED\b//g; - $atype =~ s/\bH5_ATTR_PARALLEL_USED\b//g; - $atype =~ s/\s+/ /g; - $ptr = length $1 if $atype =~ s/(\*+)//; - $atype =~ s/^\s+//; - $atype =~ s/\s+$//; - if ($atype =~ /(.*)\[(.*)\]$/) { - ($array, $atype) = ($2, $1); + my ($file, $func, $atype) = @_; + my ($ptr, $tstr, $array) = (0, "!", ""); + my ($fq_atype); + + # Normalize the data type by removing redundant white space, + # certain type qualifiers, and indirection. + $atype =~ s/^\bconst\b//; # Leading const + $atype =~ s/\s*const\s*//; # const after type, possibly in the middle of '*'s + $atype =~ s/^\bstatic\b//; + $atype =~ s/\bH5_ATTR_UNUSED\b//g; + $atype =~ s/\bH5_ATTR_DEPRECATED_USED\b//g; + $atype =~ s/\bH5_ATTR_NDEBUG_UNUSED\b//g; + $atype =~ s/\bH5_ATTR_PARALLEL_UNUSED\b//g; + $atype =~ s/\bH5_ATTR_PARALLEL_USED\b//g; + $atype =~ s/\s+/ /g; + $ptr = length $1 if $atype =~ s/(\*+)//; + $atype =~ s/^\s+//; $atype =~ s/\s+$//; - } - $fq_atype = $atype . ('*' x $ptr); - - if ($ptr>0 && exists $TypeString{$fq_atype}) { - $ptr = 0; - $tstr = $TypeString{$fq_atype}; - } elsif ($ptr>0 && exists $TypeString{"$atype*"}) { - --$ptr; - $tstr = $TypeString{"$atype*"}; - } elsif (!exists $TypeString{$atype}) { -# Defer throwing error until type is actually used -# errmesg $file, $func, "untraceable type \`$atype", '*'x$ptr, "\'"; - } else { - $tstr = $TypeString{$atype}; - } - return ("*" x $ptr) . ($array ? "[$array]" : "") . $tstr; + if ($atype =~ /(.*)\[(.*)\]$/) { + ($array, $atype) = ($2, $1); + $atype =~ s/\s+$//; + } + $fq_atype = $atype . ('*' x $ptr); + + if ($ptr>0 && exists $TypeString{$fq_atype}) { + $ptr = 0; + $tstr = $TypeString{$fq_atype}; + } elsif ($ptr>0 && exists $TypeString{"$atype*"}) { + --$ptr; + $tstr = $TypeString{"$atype*"}; + } elsif (!exists $TypeString{$atype}) { + # Defer throwing error until type is actually used + # errmesg $file, $func, "untraceable type \`$atype", '*'x$ptr, "\'"; + } else { + $tstr = $TypeString{$atype}; + } + return ("*" x $ptr) . ($array ? "[$array]" : "") . $tstr; } ############################################################################## # Given information about an API function, rewrite that function with # updated tracing information. # -my $file_api = 0; my $file_args = 0; -my $total_api = 0; my $total_args = 0; sub rewrite_func ($$$$$) { - my ($file, $type, $name, $args, $body) = @_; - my ($arg, $trace, $argtrace); - my (@arg_name, @arg_str, @arg_type); - local $_; - - # Keep copy of original arguments - my $orig_args = $args; - - # Parse return value - my $rettype = argstring $file, $name, $type; - - # Parse arguments - if ($args eq "void") { - $trace = "H5TRACE0(\"$rettype\", \"\");\n"; - $argtrace = "H5ARG_TRACE0(\"\")"; - } else { - # Split arguments - # - # First remove: - # * /*in*/, /*out*/, /*in_out*/, and /*in,out*/ comments - # * preprocessor lines that start with # - # * H5FL_TRACKING_PARAMS macros (free list code only) - # - # then split the function arguments on commas - $args =~ s/\/\*\s*in\s*\*\///g; # Get rid of /*in*/ - $args =~ s/\/\*\s*out\s*\*\///g; # Get rid of /*out*/ - $args =~ s/\/\*\s*in,\s*out\s*\*\///g; # Get rid of /*in,out*/ - $args =~ s/\/\*\s*in_out\s*\*\///g; # Get rid of /*in_out*/ - $args =~ s/H5FL_TRACK_PARAMS//g; # Remove free list macro - $args =~ s/\n#.*?\n/\n/g; # Remove lines beginning with '#' - my @args = split /,[\s\n]*/, $args; - my $argno = 0; - my %names; - - for $arg (@args) { - if($arg=~/\w*\.{3}\w*/){ # Skip "..." for varargs parameter - next; - } - unless ($arg=~/^((\s*[a-z_A-Z](\w|\*)*\s+)+(\s*\*\s*|\s*const\s*|\s*volatile\s*)*) - ([a-z_A-Z]\w*)(\[.*?\])?\s*$/x) { - errmesg $file, $name, "unable to parse \`$arg\'"; - goto error; - } else { - my ($atype, $aname, $array, $adir) = ($1, $5, $6, $8); - $names{$aname} = $argno++; - $adir ||= "in"; - $atype =~ s/\s+$//; - push @arg_name, $aname; - push @arg_type, $atype; - - if ($adir eq "out") { - push @arg_str, "x"; - } else { - if (defined $array) { - $atype .= "*"; - if ($array =~ /^\[\/\*([a-z_A-Z]\w*)\*\/\]$/) { - my $asize = $1; - if (exists $names{$asize}) { - $atype .= '[a' . $names{$asize} . ']'; - } else { - warn "bad array size: $asize"; - $atype .= "*"; - } + my ($file, $type, $name, $args, $body) = @_; + my ($arg, $argtrace); + my (@arg_name, @arg_str, @arg_type); + local $_; + + # Keep copy of original arguments + my $orig_args = $args; + + # Parse arguments + if ($args eq "void") { + $argtrace = "H5ARG_TRACE0(\"\")"; + } else { + # Split arguments + # + # First remove: + # * /*in*/, /*out*/, /*in_out*/, and /*in,out*/ comments + # * preprocessor lines that start with # + # * H5FL_TRACKING_PARAMS macros (free list code only) + # + # then split the function arguments on commas + $args =~ s/\/\*\s*in\s*\*\///g; # Get rid of /*in*/ + $args =~ s/\/\*\s*out\s*\*\///g; # Get rid of /*out*/ + $args =~ s/\/\*\s*in,\s*out\s*\*\///g; # Get rid of /*in,out*/ + $args =~ s/\/\*\s*in_out\s*\*\///g; # Get rid of /*in_out*/ + $args =~ s/H5FL_TRACK_PARAMS//g; # Remove free list macro + $args =~ s/\n#.*?\n/\n/g; # Remove lines beginning with '#' + my @args = split /,[\s\n]*/, $args; + my $argno = 0; + my %names; + + for $arg (@args) { + if($arg=~/\w*\.{3}\w*/){ # Skip "..." for varargs parameter + next; + } + unless ($arg=~/^((\s*[a-z_A-Z](\w|\*)*\s+)+(\s*\*\s*|\s*const\s*|\s*restrict\s*|\s*volatile\s*)*) + ([a-z_A-Z]\w*)(\[.*?\])?\s*$/x) { + errmesg $file, $name, "unable to parse \`$arg\'"; + goto error; + } else { + my ($atype, $aname, $array, $adir) = ($1, $5, $6, $8); + + $names{$aname} = $argno++; + $adir ||= "in"; + $atype =~ s/\s+$//; + push @arg_name, $aname; + push @arg_type, $atype; + + if ($adir eq "out") { + push @arg_str, "x"; + } else { + if (defined $array) { + $atype .= "*"; + if ($array =~ /^\[\/\*([a-z_A-Z]\w*)\*\/\]$/) { + my $asize = $1; + + if (exists $names{$asize}) { + $atype .= '[a' . $names{$asize} . ']'; + } else { + warn "bad array size: $asize"; + $atype .= "*"; + } + } + } + + push @arg_str, argstring $file, $name, $atype; + } } - } - push @arg_str, argstring $file, $name, $atype; } - } - } - # Compose the trace macro - $trace = "H5TRACE" . scalar(@arg_str) . "(\"$rettype\", \""; - $argtrace = "H5ARG_TRACE" . scalar(@arg_str) . "(__func__, \""; - $trace .= join("", @arg_str) . "\""; - $argtrace .= join("", @arg_str) . "\""; - - # Add 4 for indenting the line - my $len = 4 + length($trace); - - for my $i (0 .. $#arg_name) { - # Handle wrapping - - # Be VERY careful here! clang-format and this script MUST agree - # on which lines get wrapped or there will be churn as each tries - # to undo the other's output. - # - # TWO cases must be handled: - # 1) The argument is that last one and ');' will be appended - # 2) The argument is NOT the last one and ',' will be appended - # - # NB: clang-format does NOT consider terminal newlines when - # counting columns for the ColumnLimit - # - # The extra '2' added after $len includes the ', ' that would be - # added BEFORE the argument. - # - my $adjust = ($i + 1 == scalar(@arg_str)) ? 2 : 1; - my $len_if_added = $len + 2 + length($arg_name[$i]) + $adjust; - - # Wrap lines that will be longer than the limit - if ($len_if_added > $max_trace_macro_line_len) { - # Wrap line, with indentation - $trace .= ",\n "; - $len = 13; # Set to 13, for indentation - - # Indent an extra space to account for extra digit in 'H5TRACE' macro - if (scalar(@arg_str) >= 10) { - $trace .= " "; - $len++; - } - } else { - $trace .= ", "; - $len += 2; # Add 2, for ', ' - } + # Compose the trace macro + $argtrace = "H5ARG_TRACE" . scalar(@arg_str) . "(__func__, \""; + $argtrace .= join("", @arg_str) . "\""; - # Append argument - $trace .= "$arg_name[$i]"; - $argtrace .= ", $arg_name[$i]"; + # Append arguments + for my $i (0 .. $#arg_name) { + $argtrace .= ", $arg_name[$i]"; + } - # Add length of appended argument name - $len += length($arg_name[$i]); + # Append final ')' for macro + $argtrace .= ")"; } - # Append final ');' for macro - $trace .= ");\n"; - $argtrace .= ")"; - } - - # Check for API / non-API routine name - if( $name =~ /H5[A-Z]{0,2}[a-z].*/) { - # The H5TRACE() statement, for API routines - if ($body =~ /\/\*[ \t]*NO[ \t]*TRACE[ \t]*\*\//) { - # Ignored due to NO TRACE comment. - } else { - # Check for known, but unsupported type - if ( $trace =~ /(^#)|([^*]#)/ ) { - # Check for unsupported return type - if ( $type =~ /(^#)|([^*]#)/ ) { - errmesg $file, $name, "unsupported type in return type\nAdd to TypeString hash in trace script and update H5_trace_args()"; - print "type = '$type'\n"; - } + # Check for H5ARG_TRACE macros to update + if ( $body =~ /H5ARG_TRACE/ ) { + my $orig_body = $body; - # Check for unsupported argument type - $index = 0; - for (@arg_str) { - if ( $_ =~ /(^#)|([^*]#)/ ) { - errmesg $file, $name, "unsupported type in args\nAdd to TypeString hash in trace script and update H5_trace_args()"; - print "type = $arg_type[$index]\n"; - } - $index++; - } + # Check for untraceable type (deferred until $argtrace used) + if ( $argtrace =~ /(^!)|([^*]!)/ ) { + errmesg $file, $name, "untraceable type in args"; + print "args = '$orig_args'\n"; goto error; - } - - # Check for unknown (and therefore unsupported) type - if ( $trace =~ /(^!)|([^*]!)/ ) { - # Check for unsupported return type - if ( $type =~ /(^!)|([^*]!)/ ) { - errmesg $file, $name, "unknown type in return type\nAdd to TypeString hash in trace script and also update H5_trace_args() if used by value"; - print "type = '$type'\n"; - } + } - # Check for unsupported argument type - $index = 0; - for (@arg_str) { - if ( $_ =~ /(^!)|([^*]!)/ ) { - errmesg $file, $name, "unknown type in args\nAdd to TypeString hash in trace script and also update H5_trace_args() if used by value"; - print "type = $arg_type[$index]\n"; - } - $index++; - } - goto error; - } - - if ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) { - # Replaced an H5TRACE macro. - } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*[ \t]*(\(.*?\))?;??)\n/"$1$2$trace"/es) { - # Added an H5TRACE macro after a FUNC_ENTER macro. - } else { - errmesg $file, $name, "unable to insert tracing information"; - print "body = ", $body, "\n"; - goto error; - } - } - - #Increment # of API routines modified - $file_api++; - } - - # Check for H5ARG_TRACE macros in non-API routines - if ( $body =~ /H5ARG_TRACE/ ) { - # Check for untraceable type (deferred until $argtrace used) - if ( $argtrace =~ /(^!)|([^*]!)/ ) { - errmesg $file, $name, "untraceable type in args"; - print "args = '$orig_args'\n"; - goto error; - } - - # Replace / update H5ARG_TRACE macro. - $body =~ s/(H5ARG_TRACE(\d+\s*\(.*?\))?)/"$argtrace"/esg; - - #Increment # of non-API routines modified - $file_args++; - } - - error: - return "\n$type\n$name($orig_args)\n$body"; + # Update H5ARG_TRACE macro + $body =~ s/(H5ARG_TRACE(\d+\s*\(.*?\))?)/"$argtrace"/esg; + + # Increment # of non-API routines modified if anything changed + if ($orig_body ne $body) { + $file_args++; + } + } + +error: + return "\n$type\n$name($orig_args)\n$body"; } ############################################################################## @@ -505,41 +401,38 @@ sub rewrite_func ($$$$$) { # tracing information. # for $file (@ARGV) { - $file_api = 0; - $file_args = 0; - - # Ignore some files that do not need tracing macros - unless ($file eq "H5FDmulti.c" or $file eq "src/H5FDmulti.c" or $file eq "H5FDstdio.c" or $file eq "src/H5FDstdio.c" or $file eq "src/H5TS.c" or $file eq "src/H5FDperform.c") { - - # Snarf up the entire file - open SOURCE, $file or die "$file: $!\n"; - $Source = join "", ; - close SOURCE; - - # Make a copy of the original data - my $original = $Source; - - # Make modifications - $Source =~ s/\n([A-Za-z]\w*(\s+[A-Za-z]\w*)*\s*\**)\n #type - (H5[A-Z]{0,2}_?[a-zA-Z0-9_]\w*) #name - \s*\((.*?)\)\s* #args - (\{.*?\n\}[^\n]*) #body - /rewrite_func($file,$1,$3,$4,$5)/segx; - -# If the source changed then print out the new version - if ($original ne $Source) { - printf "%s: instrumented %d API function%s and %d argument list%s\n", - $file, $file_api, (1 == $file_api ? "" : "s"), - $file_args, (1 == $file_args ? "" : "s"); - rename $file, "$file~" or die "unable to make backup"; - open SOURCE, ">$file" or die "unable to modify source"; - print SOURCE $Source; - close SOURCE; - - $total_api += $file_api; - $total_args += $file_args; + $file_args = 0; + + # Ignore the "external" source files that don't include H5private.h + unless ($file eq "H5FDmulti.c" or $file eq "src/H5FDmulti.c" or $file eq "H5FDstdio.c" or $file eq "src/H5FDstdio.c") { + + # Snarf up the entire file + open SOURCE, $file or die "$file: $!\n"; + $Source = join "", ; + close SOURCE; + + # Make a copy of the original data + my $original = $Source; + + # Make modifications + $Source =~ s/\n([A-Za-z]\w*(\s+[A-Za-z]\w*)*\s*\**)\n #type + (H5[A-Z]{0,2}_?[a-zA-Z0-9_]\w*) #name + \s*\((.*?)\)\s* #args + (\{.*?\n\}[^\n]*) #body + /rewrite_func($file,$1,$3,$4,$5)/segx; + + # If the source changed then print out the new version + if ($original ne $Source) { + printf "%s: Instrumented %d argument list%s\n", + $file, $file_args, (1 == $file_args ? "" : "s"); + rename $file, "$file~" or die "unable to make backup"; + open SOURCE, ">$file" or die "unable to modify source"; + print SOURCE $Source; + close SOURCE; + + $total_args += $file_args; + } } - } } if ($found_errors eq 1) { @@ -549,9 +442,8 @@ if ($found_errors eq 1) { printf "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"; exit 1; } else { - printf "Finished processing HDF5 API calls:\n"; - printf "\tinstrumented %d API function%s and %d argument list%s\n", - $total_api, (1 == $total_api ? "" : "s"), + printf "Finished processing H5ES_insert() calls:\n"; + printf "\tInstrumented %d argument list%s\n", $total_args, (1 == $total_args ? "" : "s"); } diff --git a/hl/src/H5DO.c b/hl/src/H5DO.c index bd03146b6da..49786e2d8ac 100644 --- a/hl/src/H5DO.c +++ b/hl/src/H5DO.c @@ -80,20 +80,6 @@ H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *fi * * Return: Non-negative on success/Negative on failure * - * Note: - * This routine is copied from the fast forward feature branch: features/hdf5_ff - * src/H5FF.c:H5DOappend() with the following modifications: - * 1) Remove and replace macro calls such as - * FUNC_ENTER_API, H5TRACE, HGOTO_ERROR - * accordingly because hl does not have these macros - * 2) Replace H5I_get_type() by H5Iget_type() - * 3) Replace H5P_isa_class() by H5Pisa_class() - * 4) Fix a bug in the following: replace extension by size[axis] - * if(extension < old_size) { - * ret_value = FAIL; - * goto done; - * } - * *------------------------------------------------------------------------- */ herr_t diff --git a/src/H5.c b/src/H5.c index 4b0a4a2f6e9..d4521bd4c4a 100644 --- a/src/H5.c +++ b/src/H5.c @@ -539,7 +539,6 @@ H5dont_atexit(void) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT_NOERR_NOFS - H5TRACE0("e", ""); if (H5_dont_atexit_g) ret_value = FAIL; @@ -572,7 +571,6 @@ H5garbage_collect(void) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE0("e", ""); /* Call the garbage collection routines in the library */ if (H5FL_garbage_coll() < 0) @@ -616,8 +614,6 @@ H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim, herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE6("e", "IsIsIsIsIsIs", reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim, - blk_list_lim); /* Call the free list function to actually set the limits */ if (H5FL_set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim, @@ -654,7 +650,6 @@ H5get_free_list_sizes(size_t *reg_size /*out*/, size_t *arr_size /*out*/, size_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "*z*z*z*z", reg_size, arr_size, blk_size, fac_size); /* Call the free list function to actually get the sizes */ if (H5FL_get_free_list_sizes(reg_size, arr_size, blk_size, fac_size) < 0) @@ -814,7 +809,6 @@ H5get_libversion(unsigned *majnum /*out*/, unsigned *minnum /*out*/, unsigned *r herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*Iu*Iu*Iu", majnum, minnum, relnum); /* Set the version information */ if (majnum) @@ -877,7 +871,6 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT_NOERR_NOFS - H5TRACE3("e", "IuIuIu", majnum, minnum, relnum); /* Don't check again, if we already have */ if (checked) @@ -1023,7 +1016,6 @@ H5open(void) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOPUSH(FAIL) - /*NO TRACE*/ /* all work is done by FUNC_ENTER() */ @@ -1048,7 +1040,6 @@ H5atclose(H5_atclose_func_t func, void *ctx) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "Hc*x", func, ctx); /* Check arguments */ if (NULL == func) @@ -1088,7 +1079,6 @@ H5close(void) * this function for an uninitialized library. */ FUNC_ENTER_API_NOINIT_NOERR_NOFS - H5TRACE0("e", ""); H5_term_library(); @@ -1126,7 +1116,6 @@ H5allocate_memory(size_t size, bool clear) void *ret_value = NULL; FUNC_ENTER_API_NOINIT - H5TRACE2("*x", "zb", size, clear); if (0 == size) return NULL; @@ -1169,7 +1158,6 @@ H5resize_memory(void *mem, size_t size) void *ret_value = NULL; FUNC_ENTER_API_NOINIT - H5TRACE2("*x", "*xz", mem, size); ret_value = H5MM_realloc(mem, size); @@ -1192,7 +1180,6 @@ herr_t H5free_memory(void *mem) { FUNC_ENTER_API_NOINIT - H5TRACE1("e", "*x", mem); /* At this time, it is impossible for this to fail. */ H5MM_xfree(mem); @@ -1216,7 +1203,6 @@ H5is_library_threadsafe(bool *is_ts /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE1("e", "*b", is_ts); if (is_ts) { #ifdef H5_HAVE_THREADSAFE @@ -1251,7 +1237,6 @@ H5is_library_terminating(bool *is_terminating /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE1("e", "*b", is_terminating); assert(is_terminating); diff --git a/src/H5A.c b/src/H5A.c index 6728596ab52..129dd5f0de9 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -223,7 +223,6 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, h hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE6("i", "i*siiii", loc_id, attr_name, type_id, space_id, acpl_id, aapl_id); /* Create the attribute synchronously */ if ((ret_value = @@ -255,8 +254,6 @@ H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE10("i", "*s*sIui*siiiii", app_file, app_func, app_line, loc_id, attr_name, type_id, space_id, - acpl_id, aapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -372,7 +369,6 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE8("i", "i*s*siiiii", loc_id, obj_name, attr_name, type_id, space_id, acpl_id, aapl_id, lapl_id); /* Create the attribute synchronously */ if ((ret_value = H5A__create_by_name_api_common(loc_id, obj_name, attr_name, type_id, space_id, acpl_id, @@ -404,8 +400,6 @@ H5Acreate_by_name_async(const char *app_file, const char *app_func, unsigned app hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE12("i", "*s*sIui*s*siiiiii", app_file, app_func, app_line, loc_id, obj_name, attr_name, type_id, - space_id, acpl_id, aapl_id, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -539,7 +533,6 @@ H5Aopen(hid_t loc_id, const char *attr_name, hid_t aapl_id) hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "i*si", loc_id, attr_name, aapl_id); /* Open the attribute synchronously */ if ((ret_value = H5A__open_api_common(loc_id, attr_name, aapl_id, NULL, NULL)) < 0) @@ -569,7 +562,6 @@ H5Aopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIui*sii", app_file, app_func, app_line, loc_id, attr_name, aapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -667,7 +659,6 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE5("i", "i*s*sii", loc_id, obj_name, attr_name, aapl_id, lapl_id); /* Open the attribute by name asynchronously */ if ((ret_value = @@ -698,8 +689,6 @@ H5Aopen_by_name_async(const char *app_file, const char *app_func, unsigned app_l hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE9("i", "*s*sIui*s*siii", app_file, app_func, app_line, loc_id, obj_name, attr_name, aapl_id, - lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -806,7 +795,6 @@ H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "i*sIiIohii", loc_id, obj_name, idx_type, order, n, aapl_id, lapl_id); /* Open the attribute by idx synchronously */ if ((ret_value = H5A__open_by_idx_api_common(loc_id, obj_name, idx_type, order, n, aapl_id, lapl_id, NULL, @@ -838,8 +826,6 @@ H5Aopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_li hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE11("i", "*s*sIui*sIiIohiii", app_file, app_func, app_line, loc_id, obj_name, idx_type, order, n, - aapl_id, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -924,7 +910,6 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*x", attr_id, dtype_id, buf); /* Synchronously write the data */ if (H5A__write_api_common(attr_id, dtype_id, buf, NULL, NULL) < 0) @@ -952,7 +937,6 @@ H5Awrite_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIuii*xi", app_file, app_func, app_line, attr_id, dtype_id, buf, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1032,7 +1016,6 @@ H5Aread(hid_t attr_id, hid_t dtype_id, void *buf /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*x", attr_id, dtype_id, buf); /* Synchronously read the data */ if (H5A__read_api_common(attr_id, dtype_id, buf, NULL, NULL) < 0) @@ -1060,7 +1043,6 @@ H5Aread_async(const char *app_file, const char *app_func, unsigned app_line, hid herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIuii*xi", app_file, app_func, app_line, attr_id, dtype_id, buf, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1106,7 +1088,6 @@ H5Aget_space(hid_t attr_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", attr_id); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1151,7 +1132,6 @@ H5Aget_type(hid_t attr_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", attr_id); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1199,7 +1179,6 @@ H5Aget_create_plist(hid_t attr_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", attr_id); assert(H5P_LST_ATTRIBUTE_CREATE_ID_g != -1); @@ -1253,7 +1232,6 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf /*out*/) ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "iz*s", attr_id, buf_size, buf); /* check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1304,7 +1282,6 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_i ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("Zs", "i*sIiIoh*szi", loc_id, obj_name, idx_type, order, n, name, size, lapl_id); /* Check args */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -1373,7 +1350,6 @@ H5Aget_storage_size(hid_t attr_id) hsize_t ret_value; /* Return value */ FUNC_ENTER_API(0) - H5TRACE1("h", "i", attr_id); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1412,7 +1388,6 @@ H5Aget_info(hid_t attr_id, H5A_info_t *ainfo /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Ai", attr_id, ainfo); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(attr_id, H5I_ATTR))) @@ -1454,7 +1429,6 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, H herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*s*s*Aii", loc_id, obj_name, attr_name, ainfo, lapl_id); /* Check args */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -1511,7 +1485,6 @@ H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sIiIoh*Aii", loc_id, obj_name, idx_type, order, n, ainfo, lapl_id); /* Check args */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -1654,7 +1627,6 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*s", loc_id, old_name, new_name); /* Synchronously rename the attribute */ if (H5A__rename_api_common(loc_id, old_name, new_name, NULL, NULL) < 0) @@ -1682,7 +1654,6 @@ H5Arename_async(const char *app_file, const char *app_func, unsigned app_line, h herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIui*s*si", app_file, app_func, app_line, loc_id, old_name, new_name, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1767,7 +1738,6 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*s*s*si", loc_id, obj_name, old_attr_name, new_attr_name, lapl_id); /* Synchronously rename the attribute */ if (H5A__rename_by_name_api_common(loc_id, obj_name, old_attr_name, new_attr_name, lapl_id, NULL, NULL) < @@ -1797,8 +1767,6 @@ H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*s*sIui*s*s*sii", app_file, app_func, app_line, loc_id, obj_name, old_attr_name, - new_attr_name, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1872,7 +1840,6 @@ H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *i herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iIiIo*hAO*x", loc_id, idx_type, order, idx, op, op_data); /* Check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -1960,7 +1927,6 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIo*hAO*xi", loc_id, obj_name, idx_type, order, idx, op, op_data, lapl_id); /* Check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -2026,7 +1992,6 @@ H5Adelete(hid_t loc_id, const char *name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", loc_id, name); /* Check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -2085,7 +2050,6 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*s*si", loc_id, obj_name, attr_name, lapl_id); /* Check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -2155,7 +2119,6 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_ite herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*sIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id); /* check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -2212,7 +2175,6 @@ H5Aclose(hid_t attr_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", attr_id); /* Check arguments */ if (H5I_ATTR != H5I_get_type(attr_id)) @@ -2247,7 +2209,6 @@ H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, attr_id, es_id); /* Check arguments */ if (H5I_ATTR != H5I_get_type(attr_id)) @@ -2385,7 +2346,6 @@ H5Aexists(hid_t obj_id, const char *attr_name) htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "i*s", obj_id, attr_name); /* Synchronously check if an attribute exists */ exists = false; @@ -2417,7 +2377,6 @@ H5Aexists_async(const char *app_file, const char *app_func, unsigned app_line, h herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIui*s*bi", app_file, app_func, app_line, obj_id, attr_name, attr_exists, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -2497,7 +2456,6 @@ H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("t", "i*s*si", loc_id, obj_name, attr_name, lapl_id); /* Synchronously check if an attribute exists */ exists = false; @@ -2530,8 +2488,6 @@ H5Aexists_by_name_async(const char *app_file, const char *app_func, unsigned app herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*s*sIui*s*s*bii", app_file, app_func, app_line, loc_id, obj_name, attr_name, attr_exists, - lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index 25dd6627d6d..a63470a0eca 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -108,7 +108,6 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, acpl_id); /* Check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -182,7 +181,6 @@ H5Aopen_name(hid_t loc_id, const char *name) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "i*s", loc_id, name); /* Check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -247,7 +245,6 @@ H5Aopen_idx(hid_t loc_id, unsigned idx) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "iIu", loc_id, idx); /* Check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) @@ -312,7 +309,6 @@ H5Aget_num_attrs(hid_t loc_id) int ret_value = -1; FUNC_ENTER_API((-1)) - H5TRACE1("Is", "i", loc_id); loc_params.type = H5VL_OBJECT_BY_SELF; loc_params.obj_type = H5I_get_type(loc_id); @@ -382,7 +378,6 @@ H5Aiterate1(hid_t loc_id, unsigned *attr_num /*in,out*/, H5A_operator1_t op, voi herr_t ret_value; /* Return value */ FUNC_ENTER_API(H5_ITER_ERROR) - H5TRACE4("e", "i*IuAo*x", loc_id, attr_num, op, op_data); /* check arguments */ if (H5I_ATTR == H5I_get_type(loc_id)) diff --git a/src/H5D.c b/src/H5D.c index 10f647c9cb9..d15c4fa2dcd 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -179,7 +179,6 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id, dapl_id); /* Create the dataset synchronously */ if ((ret_value = H5D__create_api_common(loc_id, name, type_id, space_id, lcpl_id, dcpl_id, dapl_id, NULL, @@ -210,8 +209,6 @@ H5Dcreate_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE11("i", "*s*sIui*siiiiii", app_file, app_func, app_line, loc_id, name, type_id, space_id, lcpl_id, - dcpl_id, dapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -278,7 +275,6 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE5("i", "iiiii", loc_id, type_id, space_id, dcpl_id, dapl_id); /* Check arguments */ if (H5P_DEFAULT == dcpl_id) @@ -396,7 +392,6 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "i*si", loc_id, name, dapl_id); /* Open the dataset synchronously */ if ((ret_value = H5D__open_api_common(loc_id, name, dapl_id, NULL, NULL)) < 0) @@ -426,7 +421,6 @@ H5Dopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, dapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -468,7 +462,6 @@ H5Dclose(hid_t dset_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", dset_id); /* Check args */ if (H5I_DATASET != H5I_get_type(dset_id)) @@ -503,7 +496,6 @@ H5Dclose_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, dset_id, es_id); /* Check args */ if (H5I_DATASET != H5I_get_type(dset_id)) @@ -604,7 +596,6 @@ H5Dget_space(hid_t dset_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", dset_id); /* Get the dataset's dataspace synchronously */ if ((ret_value = H5D__get_space_api_common(dset_id, NULL, NULL)) < 0) @@ -636,7 +627,6 @@ H5Dget_space_async(const char *app_file, const char *app_func, unsigned app_line hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE5("i", "*s*sIuii", app_file, app_func, app_line, dset_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -679,7 +669,6 @@ H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Ds", dset_id, allocation); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -718,7 +707,6 @@ H5Dget_type(hid_t dset_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", dset_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -760,7 +748,6 @@ H5Dget_create_plist(hid_t dset_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", dset_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -819,7 +806,6 @@ H5Dget_access_plist(hid_t dset_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", dset_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -864,7 +850,6 @@ H5Dget_storage_size(hid_t dset_id) hsize_t ret_value = 0; /* Return value */ FUNC_ENTER_API(0) - H5TRACE1("h", "i", dset_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -906,7 +891,6 @@ H5Dget_offset(hid_t dset_id) haddr_t ret_value = HADDR_UNDEF; /* Return value */ FUNC_ENTER_API(HADDR_UNDEF) - H5TRACE1("a", "i", dset_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -1053,7 +1037,6 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf); /* Read the data */ if (H5D__read_api_common(1, &dset_id, &mem_type_id, &mem_space_id, &file_space_id, dxpl_id, &buf, NULL, @@ -1083,8 +1066,6 @@ H5Dread_async(const char *app_file, const char *app_func, unsigned app_line, hid herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIuiiiii*xi", app_file, app_func, app_line, dset_id, mem_type_id, mem_space_id, - file_space_id, dxpl_id, buf, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1124,7 +1105,6 @@ H5Dread_multi(size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_spac herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "z*i*i*i*ii**x", count, dset_id, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf); if (count == 0) HGOTO_DONE(SUCCEED); @@ -1159,8 +1139,6 @@ H5Dread_multi_async(const char *app_file, const char *app_func, unsigned app_lin herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE11("e", "*s*sIuz*i*i*i*ii**xi", app_file, app_func, app_line, count, dset_id, mem_type_id, - mem_space_id, file_space_id, dxpl_id, buf, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1201,7 +1179,6 @@ H5Dread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *fil herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "ii*h*Iu*x", dset_id, dxpl_id, offset, filters, buf); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -1363,7 +1340,6 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf); /* Write the data */ if (H5D__write_api_common(1, &dset_id, &mem_type_id, &mem_space_id, &file_space_id, dxpl_id, &buf, NULL, @@ -1394,8 +1370,6 @@ H5Dwrite_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIuiiiii*xi", app_file, app_func, app_line, dset_id, mem_type_id, mem_space_id, - file_space_id, dxpl_id, buf, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1435,7 +1409,6 @@ H5Dwrite_multi(size_t count, hid_t dset_id[], hid_t mem_type_id[], hid_t mem_spa herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "z*i*i*i*ii**x", count, dset_id, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf); if (count == 0) HGOTO_DONE(SUCCEED); @@ -1470,8 +1443,6 @@ H5Dwrite_multi_async(const char *app_file, const char *app_func, unsigned app_li herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE11("e", "*s*sIuz*i*i*i*ii**xi", app_file, app_func, app_line, count, dset_id, mem_type_id, - mem_space_id, file_space_id, dxpl_id, buf, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1514,7 +1485,6 @@ H5Dwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *of herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iiIu*hz*x", dset_id, dxpl_id, filters, offset, data_size, buf); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -1581,7 +1551,6 @@ H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, hid_t dst_space_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "DS*xii*x", op, op_data, type_id, dst_space_id, dst_buf); /* Check args */ if (op == NULL) @@ -1674,7 +1643,6 @@ H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id, size_t dst_buf herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*xiz*xDg*x", src_space_id, src_buf, type_id, dst_buf_size, dst_buf, op, op_data); /* Check args */ if (NULL == (src_space = (H5S_t *)H5I_object_verify(src_space_id, H5I_DATASPACE))) @@ -1774,7 +1742,6 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*xi*xii", fill, fill_type_id, buf, buf_type_id, space_id); /* Check args */ if (buf == NULL) @@ -1859,7 +1826,6 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, void *op herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*xiiDO*x", buf, type_id, space_id, op, operator_data); /* Check args */ if (NULL == op) @@ -1906,7 +1872,6 @@ H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id, hsize_t *s herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iii*h", dataset_id, type_id, space_id, size); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(dataset_id))) @@ -2007,7 +1972,6 @@ H5Dset_extent(hid_t dset_id, const hsize_t size[]) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", dset_id, size); /* Change a datset's dimensions synchronously */ if ((ret_value = H5D__set_extent_api_common(dset_id, size, NULL, NULL)) < 0) @@ -2036,7 +2000,6 @@ H5Dset_extent_async(const char *app_file, const char *app_func, unsigned app_lin herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "*s*sIui*hi", app_file, app_func, app_line, dset_id, size, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -2075,7 +2038,6 @@ H5Dflush(hid_t dset_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", dset_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -2117,7 +2079,6 @@ H5Drefresh(hid_t dset_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", dset_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -2161,7 +2122,6 @@ H5Dformat_convert(hid_t dset_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", dset_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -2201,7 +2161,6 @@ H5Dget_chunk_index_type(hid_t dset_id, H5D_chunk_index_t *idx_type /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Dk", dset_id, idx_type); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -2243,7 +2202,6 @@ H5Dget_chunk_storage_size(hid_t dset_id, const hsize_t *offset, hsize_t *chunk_n herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*h*h", dset_id, offset, chunk_nbytes); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -2294,7 +2252,6 @@ H5Dget_num_chunks(hid_t dset_id, hid_t fspace_id, hsize_t *nchunks /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*h", dset_id, fspace_id, nchunks); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -2346,7 +2303,6 @@ H5Dget_chunk_info(hid_t dset_id, hid_t fspace_id, hsize_t chk_index, hsize_t *of herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE7("e", "iih*h*Iu*a*h", dset_id, fspace_id, chk_index, offset, filter_mask, addr, size); /* Check arguments */ if (NULL == offset && NULL == filter_mask && NULL == addr && NULL == size) @@ -2415,7 +2371,6 @@ H5Dget_chunk_info_by_coord(hid_t dset_id, const hsize_t *offset, unsigned *filte herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*h*Iu*a*h", dset_id, offset, filter_mask, addr, size); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -2466,7 +2421,6 @@ H5Dchunk_iter(hid_t dset_id, hid_t dxpl_id, H5D_chunk_iter_op_t op, void *op_dat herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iix*x", dset_id, dxpl_id, op, op_data); /* Check arguments */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) diff --git a/src/H5Ddbg.c b/src/H5Ddbg.c index d8a9234675c..d011303d3c6 100644 --- a/src/H5Ddbg.c +++ b/src/H5Ddbg.c @@ -66,7 +66,6 @@ H5Ddebug(hid_t dset_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", dset_id); /* Check args */ if (NULL == (dset = (H5D_t *)H5VL_object_verify(dset_id, H5I_DATASET))) diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index e763a9b7b2e..5b0f4e33ede 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -103,7 +103,6 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, dcpl_id); /* Check arguments */ if (!name) @@ -172,7 +171,6 @@ H5Dopen1(hid_t loc_id, const char *name) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "i*s", loc_id, name); /* Check args */ if (!name) @@ -232,7 +230,6 @@ H5Dextend(hid_t dset_id, const hsize_t size[]) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", dset_id, size); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(dset_id, H5I_DATASET))) @@ -311,7 +308,6 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t dxpl_id, void *buf) herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iii*x", type_id, space_id, dxpl_id, buf); /* Check args */ if (buf == NULL) diff --git a/src/H5E.c b/src/H5E.c index 36f07048e94..755172c755d 100644 --- a/src/H5E.c +++ b/src/H5E.c @@ -390,7 +390,6 @@ H5Eregister_class(const char *cls_name, const char *lib_name, const char *versio hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "*s*s*s", cls_name, lib_name, version); /* Check arguments */ if (cls_name == NULL || lib_name == NULL || version == NULL) @@ -469,7 +468,6 @@ H5Eunregister_class(hid_t class_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", class_id); /* Check arguments */ if (H5I_ERROR_CLASS != H5I_get_type(class_id)) @@ -534,7 +532,6 @@ H5Eget_class_name(hid_t class_id, char *name /*out*/, size_t size) ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "i*sz", class_id, name, size); /* Get the error class */ if (NULL == (cls = (H5E_cls_t *)H5I_object_verify(class_id, H5I_ERROR_CLASS))) @@ -632,7 +629,6 @@ H5Eclose_msg(hid_t err_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", err_id); /* Check arguments */ if (H5I_ERROR_MSG != H5I_get_type(err_id)) @@ -689,7 +685,6 @@ H5Ecreate_msg(hid_t class_id, H5E_type_t msg_type, const char *msg_str) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "iEt*s", class_id, msg_type, msg_str); /* Check arguments */ if (msg_type != H5E_MAJOR && msg_type != H5E_MINOR) @@ -774,7 +769,6 @@ H5Eget_msg(hid_t msg_id, H5E_type_t *type /*out*/, char *msg_str /*out*/, size_t ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API_NOCLEAR((-1)) - H5TRACE4("Zs", "i*Et*sz", msg_id, type, msg_str, size); /* Get the message object */ if (NULL == (msg = (H5E_msg_t *)H5I_object_verify(msg_id, H5I_ERROR_MSG))) @@ -805,7 +799,6 @@ H5Ecreate_stack(void) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE0("i", ""); /* Allocate a new error stack */ if (NULL == (stk = H5FL_CALLOC(H5E_t))) @@ -841,7 +834,6 @@ H5Eget_current_stack(void) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(H5I_INVALID_HID) - H5TRACE0("i", ""); /* Get the current stack */ if (NULL == (stk = H5E__get_current_stack())) @@ -947,7 +939,6 @@ H5Eset_current_stack(hid_t err_stack) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", err_stack); if (err_stack != H5E_DEFAULT) { if (NULL == (estack = (H5E_t *)H5I_object_verify(err_stack, H5I_ERROR_STACK))) @@ -1045,7 +1036,6 @@ H5Eclose_stack(hid_t stack_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", stack_id); if (H5E_DEFAULT != stack_id) { /* Check arguments */ @@ -1108,7 +1098,6 @@ H5Eget_num(hid_t error_stack_id) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR((-1)) - H5TRACE1("Zs", "i", error_stack_id); /* Need to check for errors */ if (error_stack_id == H5E_DEFAULT) { @@ -1169,7 +1158,6 @@ H5Epop(hid_t err_stack, size_t count) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE2("e", "iz", err_stack, count); /* Need to check for errors */ if (err_stack == H5E_DEFAULT) { @@ -1228,7 +1216,6 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line, hid /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE8("e", "i*s*sIuiii*s", err_stack, file, func, line, cls_id, maj_id, min_id, fmt); if (err_stack == H5E_DEFAULT) estack = NULL; @@ -1287,7 +1274,6 @@ H5Eclear2(hid_t err_stack) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE1("e", "i", err_stack); /* Need to check for errors */ if (err_stack == H5E_DEFAULT) @@ -1327,7 +1313,6 @@ H5Eprint2(hid_t err_stack, FILE *stream) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - /*NO TRACE*/ /* Print error stack */ if ((ret_value = H5E__print2(err_stack, stream)) < 0) @@ -1394,7 +1379,6 @@ H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t stack_func, voi /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - /*NO TRACE*/ /* Need to check for errors */ if (err_stack == H5E_DEFAULT) { @@ -1440,7 +1424,6 @@ H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func /*out*/, void **client_data /*ou /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE3("e", "i*EA**x", estack_id, func, client_data); if (estack_id == H5E_DEFAULT) { if (NULL == (estack = H5E__get_my_stack())) @@ -1499,7 +1482,6 @@ H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE3("e", "iEA*x", estack_id, func, client_data); if (estack_id == H5E_DEFAULT) { if (NULL == (estack = H5E__get_my_stack())) @@ -1557,7 +1539,6 @@ H5Eauto_is_v2(hid_t estack_id, unsigned *is_stack) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE2("e", "i*Iu", estack_id, is_stack); if (estack_id == H5E_DEFAULT) { if (NULL == (estack = H5E__get_my_stack())) @@ -1601,7 +1582,6 @@ H5Eappend_stack(hid_t dst_stack_id, hid_t src_stack_id, hbool_t close_source_sta /* Don't clear the error stack! :-) */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iib", dst_stack_id, src_stack_id, close_source_stack); /* Check args */ if (NULL == (dst_stack = (H5E_t *)H5I_object_verify(dst_stack_id, H5I_ERROR_STACK))) diff --git a/src/H5ES.c b/src/H5ES.c index 1c8b0876e11..a354db3016d 100644 --- a/src/H5ES.c +++ b/src/H5ES.c @@ -83,7 +83,6 @@ H5EScreate(void) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE0("i", ""); /* Create the new event set object */ if (NULL == (es = H5ES__create())) @@ -117,7 +116,6 @@ H5ESinsert_request(hid_t es_id, hid_t connector_id, void *request) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*x", es_id, connector_id, request); /* Check arguments */ if (NULL == (es = H5I_object_verify(es_id, H5I_EVENTSET))) @@ -160,7 +158,6 @@ H5ESget_count(hid_t es_id, size_t *count /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*z", es_id, count); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -201,7 +198,6 @@ H5ESget_op_counter(hid_t es_id, uint64_t *op_counter /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*UL", es_id, op_counter); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -251,7 +247,6 @@ H5ESget_requests(hid_t es_id, H5_iter_order_t order, hid_t *connector_ids, void herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iIo*i**xz*z", es_id, order, connector_ids, requests, array_len, count); /* Check arguments */ if (NULL == (es = H5I_object_verify(es_id, H5I_EVENTSET))) @@ -303,7 +298,6 @@ H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress /*out*/, hbool_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iUL*z*b", es_id, timeout, num_in_progress, op_failed); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -343,7 +337,6 @@ H5EScancel(hid_t es_id, size_t *num_not_canceled /*out*/, hbool_t *op_failed /*o herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*z*b", es_id, num_not_canceled, op_failed); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -383,7 +376,6 @@ H5ESget_err_status(hid_t es_id, hbool_t *err_status /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", es_id, err_status); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -422,7 +414,6 @@ H5ESget_err_count(hid_t es_id, size_t *num_errs /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*z", es_id, num_errs); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -466,7 +457,6 @@ H5ESget_err_info(hid_t es_id, size_t num_err_info, H5ES_err_info_t err_info[] /* herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iz*#*z", es_id, num_err_info, err_info, num_cleared); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -507,7 +497,6 @@ H5ESfree_err_info(size_t num_err_info, H5ES_err_info_t err_info[]) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "z*#", num_err_info, err_info); /* Check arguments */ if (0 == num_err_info) @@ -550,7 +539,6 @@ H5ESregister_insert_func(hid_t es_id, H5ES_event_insert_func_t func, void *ctx) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iEI*x", es_id, func, ctx); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -592,7 +580,6 @@ H5ESregister_complete_func(hid_t es_id, H5ES_event_complete_func_t func, void *c herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iEC*x", es_id, func, ctx); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { @@ -632,7 +619,6 @@ H5ESclose(hid_t es_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", es_id); /* Passing H5ES_NONE is valid, but a no-op */ if (H5ES_NONE != es_id) { diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c index 471630c724d..1f85b00c8f2 100644 --- a/src/H5Edeprec.c +++ b/src/H5Edeprec.c @@ -86,7 +86,6 @@ H5Eget_major(H5E_major_t maj) char *ret_value; /* Return value */ FUNC_ENTER_API_NOCLEAR(NULL) - H5TRACE1("*s", "i", maj); /* Get the message object */ if (NULL == (msg = (H5E_msg_t *)H5I_object_verify(maj, H5I_ERROR_MSG))) @@ -135,7 +134,6 @@ H5Eget_minor(H5E_minor_t min) char *ret_value; /* Return value */ FUNC_ENTER_API_NOCLEAR(NULL) - H5TRACE1("*s", "i", min); /* Get the message object */ if (NULL == (msg = (H5E_msg_t *)H5I_object_verify(min, H5I_ERROR_MSG))) @@ -188,7 +186,6 @@ H5Epush1(const char *file, const char *func, unsigned line, H5E_major_t maj, H5E /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE6("e", "*s*sIuii*s", file, func, line, maj, min, str); /* Push the error on the default error stack */ if (H5E__push_stack(NULL, file, func, line, H5E_ERR_CLS_g, maj, min, str) < 0) @@ -215,7 +212,6 @@ H5Eclear1(void) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE0("e", ""); /* Clear the default error stack */ if (H5E_clear_stack(NULL) < 0) @@ -246,7 +242,6 @@ H5Eprint1(FILE *stream) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - /*NO TRACE*/ if (NULL == (estack = H5E__get_my_stack())) HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack"); @@ -279,7 +274,6 @@ H5Ewalk1(H5E_direction_t direction, H5E_walk1_t func, void *client_data) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - /*NO TRACE*/ if (NULL == (estack = H5E__get_my_stack())) HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack"); @@ -315,7 +309,6 @@ H5Eget_auto1(H5E_auto1_t *func /*out*/, void **client_data /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "*Ea**x", func, client_data); /* Retrieve default error stack */ if (NULL == (estack = H5E__get_my_stack())) @@ -365,7 +358,6 @@ H5Eset_auto1(H5E_auto1_t func, void *client_data) /* Don't clear the error stack! :-) */ FUNC_ENTER_API_NOCLEAR(FAIL) - H5TRACE2("e", "Ea*x", func, client_data); if (NULL == (estack = H5E__get_my_stack())) HGOTO_ERROR(H5E_ERROR, H5E_CANTGET, FAIL, "can't get current error stack"); diff --git a/src/H5F.c b/src/H5F.c index ee4fd71af64..5dcda189241 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -116,7 +116,6 @@ H5Fget_create_plist(hid_t file_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", file_id); /* check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(file_id))) @@ -163,7 +162,6 @@ H5Fget_access_plist(hid_t file_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", file_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(file_id))) @@ -226,7 +224,6 @@ H5Fget_obj_count(hid_t file_id, unsigned types) ssize_t ret_value = 0; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE2("Zs", "iIu", file_id, types); /* Check arguments */ if (0 == (types & H5F_OBJ_ALL)) @@ -344,7 +341,6 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *oid_list / ssize_t ret_value = 0; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE4("Zs", "iIuz*i", file_id, types, max_objs, oid_list); /* Check arguments */ if (0 == (types & H5F_OBJ_ALL)) @@ -437,7 +433,6 @@ H5Fget_vfd_handle(hid_t file_id, hid_t fapl_id, void **file_handle /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii**x", file_id, fapl_id, file_handle); /* Check args */ if (!file_handle) @@ -479,7 +474,6 @@ H5Fis_accessible(const char *filename, hid_t fapl_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "*si", filename, fapl_id); /* Check args */ if (!filename || !*filename) @@ -653,7 +647,6 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE4("i", "*sIuii", filename, flags, fcpl_id, fapl_id); /* Create the file synchronously */ if ((ret_value = H5F__create_api_common(filename, flags, fcpl_id, fapl_id, NULL)) < 0) @@ -692,7 +685,6 @@ H5Fcreate_async(const char *app_file, const char *app_func, unsigned app_line, c hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE8("i", "*s*sIu*sIuiii", app_file, app_func, app_line, filename, flags, fcpl_id, fapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -829,7 +821,6 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "*sIui", filename, flags, fapl_id); /* Open the file synchronously */ if ((ret_value = H5F__open_api_common(filename, flags, fapl_id, NULL)) < 0) @@ -869,7 +860,6 @@ H5Fopen_async(const char *app_file, const char *app_func, unsigned app_line, con hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIu*sIuii", app_file, app_func, app_line, filename, flags, fapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -975,7 +965,6 @@ H5Fflush(hid_t object_id, H5F_scope_t scope) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iFs", object_id, scope); /* Flush the file synchronously */ if (H5F__flush_api_common(object_id, scope, NULL, NULL) < 0) @@ -1005,7 +994,6 @@ H5Fflush_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "*s*sIuiFsi", app_file, app_func, app_line, object_id, scope, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1047,7 +1035,6 @@ H5Fclose(hid_t file_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", file_id); /* Check arguments */ if (H5I_FILE != H5I_get_type(file_id)) @@ -1082,7 +1069,6 @@ H5Fclose_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, file_id, es_id); /* Check arguments */ if (H5I_FILE != H5I_get_type(file_id)) @@ -1143,7 +1129,6 @@ H5Fdelete(const char *filename, hid_t fapl_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "*si", filename, fapl_id); /* Check args */ if (!filename || !*filename) @@ -1212,7 +1197,6 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id); /* Check arguments */ loc_type = H5I_get_type(loc_id); @@ -1329,7 +1313,6 @@ H5Funmount(hid_t loc_id, const char *name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", loc_id, name); /* Check arguments */ loc_type = H5I_get_type(loc_id); @@ -1466,7 +1449,6 @@ H5Freopen(hid_t file_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", file_id); /* Reopen the file synchronously */ if ((ret_value = H5F__reopen_api_common(file_id, NULL)) < 0) @@ -1506,7 +1488,6 @@ H5Freopen_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE5("i", "*s*sIuii", app_file, app_func, app_line, file_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1567,7 +1548,6 @@ H5Fget_intent(hid_t file_id, unsigned *intent_flags /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", file_id, intent_flags); /* If no intent flags were passed in, exit quietly */ if (intent_flags) { @@ -1607,7 +1587,6 @@ H5Fget_fileno(hid_t file_id, unsigned long *fnumber /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Ul", file_id, fnumber); /* If no fnumber pointer was passed in, exit quietly */ if (fnumber) { @@ -1650,7 +1629,6 @@ H5Fget_freespace(hid_t file_id) hssize_t ret_value; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE1("Hs", "i", file_id); /* Get the file object */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(file_id))) @@ -1692,7 +1670,6 @@ H5Fget_filesize(hid_t file_id, hsize_t *size /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", file_id, size); /* Check args */ if (!size) @@ -1760,7 +1737,6 @@ H5Fget_file_image(hid_t file_id, void *buf /*out*/, size_t buf_len) ssize_t ret_value; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "i*xz", file_id, buf, buf_len); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -1807,7 +1783,6 @@ H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Cc", file_id, config); /* Check args */ if ((NULL == config) || (config->version != H5AC__CURR_CACHE_CONFIG_VERSION)) @@ -1850,7 +1825,6 @@ H5Fset_mdc_config(hid_t file_id, const H5AC_cache_config_t *config_ptr) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Cc", file_id, config_ptr); /* Get the file object */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(file_id))) @@ -1890,7 +1864,6 @@ H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*d", file_id, hit_rate); /* Check args */ if (NULL == hit_rate) @@ -1935,7 +1908,6 @@ H5Fget_mdc_size(hid_t file_id, size_t *max_size /*out*/, size_t *min_clean_size herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*z*z*z*Is", file_id, max_size, min_clean_size, cur_size, cur_num_entries); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -1985,7 +1957,6 @@ H5Freset_mdc_hit_rate_stats(hid_t file_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", file_id); /* Get the file object */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(file_id))) @@ -2032,7 +2003,6 @@ H5Fget_name(hid_t obj_id, char *name /*out*/, size_t size) ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "i*sz", obj_id, name, size); /* Check the type */ type = H5I_get_type(obj_id); @@ -2085,7 +2055,6 @@ H5Fget_info2(hid_t obj_id, H5F_info2_t *finfo /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*FI", obj_id, finfo); /* Check args */ if (!finfo) @@ -2134,7 +2103,6 @@ H5Fget_metadata_read_retry_info(hid_t file_id, H5F_retry_info_t *info /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*!", file_id, info); /* Check args */ if (!info) @@ -2179,7 +2147,6 @@ H5Fget_free_sections(hid_t file_id, H5F_mem_t type, size_t nsects, H5F_sect_info ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE4("Zs", "iFmz*!", file_id, type, nsects, sect_info); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2225,7 +2192,6 @@ H5Fclear_elink_file_cache(hid_t file_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", file_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2285,7 +2251,6 @@ H5Fstart_swmr_write(hid_t file_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", file_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2325,7 +2290,6 @@ H5Fstart_mdc_logging(hid_t file_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", file_id); /* Sanity check */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2362,7 +2326,6 @@ H5Fstop_mdc_logging(hid_t file_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", file_id); /* Sanity check */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2400,7 +2363,6 @@ H5Fget_mdc_logging_status(hid_t file_id, hbool_t *is_enabled /*out*/, hbool_t *i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*b*b", file_id, is_enabled, is_currently_logging); /* Sanity check */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2441,7 +2403,6 @@ H5Fset_libver_bounds(hid_t file_id, H5F_libver_t low, H5F_libver_t high) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iFvFv", file_id, low, high); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2484,7 +2445,6 @@ H5Fformat_convert(hid_t file_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", file_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2523,7 +2483,6 @@ H5Freset_page_buffering_stats(hid_t file_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", file_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2561,7 +2520,6 @@ H5Fget_page_buffering_stats(hid_t file_id, unsigned accesses[2] /*out*/, unsigne herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*Iu*Iu*Iu*Iu*Iu", file_id, accesses, hits, misses, evictions, bypasses); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2608,7 +2566,6 @@ H5Fget_mdc_image_info(hid_t file_id, haddr_t *image_addr /*out*/, hsize_t *image herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*a*h", file_id, image_addr, image_len); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2646,7 +2603,6 @@ H5Fget_eoa(hid_t file_id, haddr_t *eoa /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*a", file_id, eoa); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2689,7 +2645,6 @@ H5Fincrement_filesize(hid_t file_id, hsize_t increment) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ih", file_id, increment); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -2727,7 +2682,6 @@ H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", file_id, minimize); /* Check args */ if (NULL == minimize) @@ -2767,7 +2721,6 @@ H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", file_id, minimize); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) diff --git a/src/H5FD.c b/src/H5FD.c index f8ad0275d34..d2e7cff1bac 100644 --- a/src/H5FD.c +++ b/src/H5FD.c @@ -207,7 +207,6 @@ H5FDregister(const H5FD_class_t *cls) hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "*FC", cls); /* Check arguments */ if (!cls) @@ -309,7 +308,6 @@ H5FDis_driver_registered_by_name(const char *driver_name) htri_t ret_value = false; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "*s", driver_name); /* Check if driver with this name is registered */ if ((ret_value = H5FD_is_driver_registered_by_name(driver_name, NULL)) < 0) @@ -337,7 +335,6 @@ H5FDis_driver_registered_by_value(H5FD_class_value_t driver_value) htri_t ret_value = false; FUNC_ENTER_API(FAIL) - H5TRACE1("t", "DV", driver_value); /* Check if driver with this value is registered */ if ((ret_value = H5FD_is_driver_registered_by_value(driver_value, NULL)) < 0) @@ -365,7 +362,6 @@ H5FDunregister(hid_t driver_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", driver_id); /* Check arguments */ if (NULL == H5I_object_verify(driver_id, H5I_VFL)) @@ -689,7 +685,6 @@ H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) H5FD_t *ret_value = NULL; FUNC_ENTER_API(NULL) - H5TRACE4("*#", "*sIuia", name, flags, fapl_id, maxaddr); /* Check arguments */ if (H5P_DEFAULT == fapl_id) @@ -825,7 +820,6 @@ H5FDclose(H5FD_t *file) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*#", file); /* Check arguments */ if (!file) @@ -903,7 +897,6 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2) int ret_value = -1; FUNC_ENTER_API(-1) /* return value is arbitrary */ - H5TRACE2("Is", "*#*#", f1, f2); /* Call private function */ ret_value = H5FD_cmp(f1, f2); @@ -973,7 +966,6 @@ H5FDquery(const H5FD_t *file, unsigned long *flags /*out*/) int ret_value = 0; FUNC_ENTER_API((-1)) - H5TRACE2("Is", "*#*Ul", file, flags); /* Check arguments */ if (!file) @@ -1066,7 +1058,6 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) haddr_t ret_value = HADDR_UNDEF; FUNC_ENTER_API(HADDR_UNDEF) - H5TRACE4("a", "*#Mtih", file, type, dxpl_id, size); /* Check arguments */ if (!file) @@ -1116,7 +1107,6 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t siz herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*#Mtiah", file, type, dxpl_id, addr, size); /* Check arguments */ if (!file) @@ -1159,7 +1149,6 @@ H5FDget_eoa(H5FD_t *file, H5FD_mem_t type) haddr_t ret_value; FUNC_ENTER_API(HADDR_UNDEF) - H5TRACE2("a", "*#Mt", file, type); /* Check arguments */ if (!file) @@ -1207,7 +1196,6 @@ H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*#Mta", file, type, addr); /* Check arguments */ if (!file) @@ -1255,7 +1243,6 @@ H5FDget_eof(H5FD_t *file, H5FD_mem_t type) haddr_t ret_value; FUNC_ENTER_API(HADDR_UNDEF) - H5TRACE2("a", "*#Mt", file, type); /* Check arguments */ if (!file) @@ -1405,7 +1392,6 @@ H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "*#Mtiaz*x", file, type, dxpl_id, addr, size, buf); /* Check arguments */ if (!file) @@ -1451,7 +1437,6 @@ H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "*#Mtiaz*x", file, type, dxpl_id, addr, size, buf); /* Check arguments */ if (!file) @@ -1507,7 +1492,6 @@ H5FDread_vector(H5FD_t *file, hid_t dxpl_id, uint32_t count, H5FD_mem_t types[], herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*#iIu*Mt*a*z**x", file, dxpl_id, count, types, addrs, sizes, bufs); /* Check arguments */ if (!file) @@ -1583,7 +1567,6 @@ H5FDwrite_vector(H5FD_t *file, hid_t dxpl_id, uint32_t count, H5FD_mem_t types[] herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*#iIu*Mt*a*z**x", file, dxpl_id, count, types, addrs, sizes, bufs); /* Check arguments */ if (!file) @@ -1676,8 +1659,6 @@ H5FDread_selection(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t count, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*#MtiIu*i*i*a*z**x", file, type, dxpl_id, count, mem_space_ids, file_space_ids, offsets, - element_sizes, bufs); /* Check arguments */ if (!file) @@ -1773,8 +1754,6 @@ H5FDwrite_selection(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t count herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*#MtiIu*i*i*a*z**x", file, type, dxpl_id, count, mem_space_ids, file_space_ids, offsets, - element_sizes, bufs); /* Check arguments */ if (!file) @@ -1877,8 +1856,6 @@ H5FDread_vector_from_selection(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uin herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*#MtiIu*i*i*a*z**x", file, type, dxpl_id, count, mem_space_ids, file_space_ids, offsets, - element_sizes, bufs); /* Check arguments */ if (!file) @@ -1975,8 +1952,6 @@ H5FDwrite_vector_from_selection(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, ui herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*#MtiIu*i*i*a*z**x", file, type, dxpl_id, count, mem_space_ids, file_space_ids, offsets, - element_sizes, bufs); /* Check arguments */ if (!file) @@ -2073,8 +2048,6 @@ H5FDread_from_selection(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t c herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*#MtiIu*i*i*a*z**x", file, type, dxpl_id, count, mem_space_ids, file_space_ids, offsets, - element_sizes, bufs); /* Check arguments */ if (!file) @@ -2170,8 +2143,6 @@ H5FDwrite_from_selection(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*#MtiIu*i*i*a*z**x", file, type, dxpl_id, count, mem_space_ids, file_space_ids, offsets, - element_sizes, bufs); /* Check arguments */ if (!file) @@ -2237,7 +2208,6 @@ H5FDflush(H5FD_t *file, hid_t dxpl_id, hbool_t closing) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*#ib", file, dxpl_id, closing); /* Check arguments */ if (!file) @@ -2304,7 +2274,6 @@ H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*#ib", file, dxpl_id, closing); /* Check arguments */ if (!file) @@ -2370,7 +2339,6 @@ H5FDlock(H5FD_t *file, hbool_t rw) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "*#b", file, rw); /* Check arguments */ if (!file) @@ -2429,7 +2397,6 @@ H5FDunlock(H5FD_t *file) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*#", file); /* Check arguments */ if (!file) @@ -2497,7 +2464,6 @@ H5FDctl(H5FD_t *file, uint64_t op_code, uint64_t flags, const void *input, void herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*#ULUL*x**x", file, op_code, flags, input, output); /* Check arguments */ if (!file) @@ -2616,7 +2582,6 @@ H5FDget_vfd_handle(H5FD_t *file, hid_t fapl_id, void **file_handle /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*#i**x", file, fapl_id, file_handle); /* Check arguments */ if (!file) @@ -2760,7 +2725,6 @@ H5FDdriver_query(hid_t driver_id, unsigned long *flags /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Ul", driver_id, flags); /* Check arguments */ if (NULL == flags) @@ -2791,7 +2755,6 @@ H5FDdelete(const char *filename, hid_t fapl_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "*si", filename, fapl_id); /* Check arguments */ if (!filename || !*filename) diff --git a/src/H5FDcore.c b/src/H5FDcore.c index c74ef5ed28a..2b0d66e7b0e 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -518,7 +518,6 @@ H5Pset_core_write_tracking(hid_t plist_id, hbool_t is_enabled, size_t page_size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ibz", plist_id, is_enabled, page_size); /* The page size cannot be zero */ if (page_size == 0) @@ -565,7 +564,6 @@ H5Pget_core_write_tracking(hid_t plist_id, hbool_t *is_enabled /*out*/, size_t * herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*b*z", plist_id, is_enabled, page_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -604,7 +602,6 @@ H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "izb", fapl_id, increment, backing_store); /* Check argument */ if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) @@ -642,7 +639,6 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, hbool_t *backing_stor herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*z*b", fapl_id, increment, backing_store); if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list"); diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index dc80a614e6a..b072eeeec08 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -263,7 +263,6 @@ H5Pset_fapl_direct(hid_t fapl_id, size_t boundary, size_t block_size, size_t cbu herr_t ret_value; FUNC_ENTER_API(FAIL) - H5TRACE4("e", "izzz", fapl_id, boundary, block_size, cbuf_size); if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list"); @@ -298,7 +297,6 @@ H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary /*out*/, size_t *block_size / herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*z*z*z", fapl_id, boundary, block_size, cbuf_size); if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list"); diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index 9899b2e1906..22efa901812 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -336,7 +336,6 @@ H5Pset_fapl_family(hid_t fapl_id, hsize_t msize, hid_t memb_fapl_id) H5P_genplist_t *plist; /* Property list pointer */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ihi", fapl_id, msize, memb_fapl_id); /* Check arguments */ if (true != H5P_isa_class(fapl_id, H5P_FILE_ACCESS)) @@ -382,7 +381,6 @@ H5Pget_fapl_family(hid_t fapl_id, hsize_t *msize /*out*/, hid_t *memb_fapl_id /* herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*h*i", fapl_id, msize, memb_fapl_id); if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list"); diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index 140e5df8f7e..7f7a2950ae3 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -560,7 +560,6 @@ H5Pset_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa) herr_t ret_value = FAIL; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*#", fapl_id, fa); assert(fa != NULL); @@ -600,7 +599,6 @@ H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_dst /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*#", fapl_id, fa_dst); #if HDFS_DEBUG fprintf(stdout, "called %s.\n", __func__); diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 677382552e8..3fdf6548b43 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -299,7 +299,6 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, si herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*sULz", fapl_id, logfile, flags, buf_size); /* Do this first, so that we don't try to free a wild pointer if * H5P_object_verify() fails. diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c index baf6ed5a7d5..d5b9c08186d 100644 --- a/src/H5FDmirror.c +++ b/src/H5FDmirror.c @@ -1263,7 +1263,6 @@ H5Pget_fapl_mirror(hid_t fapl_id, H5FD_mirror_fapl_t *fa_dst /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*#", fapl_id, fa_dst); LOG_OP_CALL(__func__); @@ -1304,7 +1303,6 @@ H5Pset_fapl_mirror(hid_t fapl_id, H5FD_mirror_fapl_t *fa) herr_t ret_value = FAIL; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*#", fapl_id, fa); LOG_OP_CALL(__func__); diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 2668b27cead..5f88d37668c 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -389,7 +389,6 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info) herr_t ret_value; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iMcMi", fapl_id, comm, info); /* Check arguments */ if (fapl_id == H5P_DEFAULT) @@ -439,7 +438,6 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm /*out*/, MPI_Info *info /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Mc*Mi", fapl_id, comm, info); /* Set comm and info in case we have problems */ if (comm) @@ -503,7 +501,6 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iDt", dxpl_id, xfer_mode); /* Check arguments */ if (dxpl_id == H5P_DEFAULT) @@ -541,7 +538,6 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Dt", dxpl_id, xfer_mode); /* Check arguments */ if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER))) @@ -579,7 +575,6 @@ H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mo herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iDc", dxpl_id, opt_mode); /* Check arguments */ if (dxpl_id == H5P_DEFAULT) @@ -618,7 +613,6 @@ H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iDh", dxpl_id, opt_mode); /* Check arguments */ if (dxpl_id == H5P_DEFAULT) @@ -655,7 +649,6 @@ H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", dxpl_id, num_chunk_per_proc); /* Check arguments */ if (dxpl_id == H5P_DEFAULT) @@ -695,7 +688,6 @@ H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_ch herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", dxpl_id, percent_num_proc_per_chunk); /* Check arguments */ if (dxpl_id == H5P_DEFAULT) diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 51e483f8a39..2838ed00bff 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -280,8 +280,6 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const c H5FD_multi_fapl_t fa; static const char *func = "H5Pset_fapl_split"; /* Function Name for error reporting */ - /*NO TRACE*/ - /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); @@ -372,8 +370,6 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_f H5FD_multi_fapl_t fa; static const char *func = "H5FDset_fapl_multi"; /* Function Name for error reporting */ - /*NO TRACE*/ - /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); @@ -408,8 +404,6 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl H5FD_mem_t mt; static const char *func = "H5FDget_fapl_multi"; /* Function Name for error reporting */ - /*NO TRACE*/ - /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); diff --git a/src/H5FDonion.c b/src/H5FDonion.c index 65b7fa51dd8..db122ed26d8 100644 --- a/src/H5FDonion.c +++ b/src/H5FDonion.c @@ -281,7 +281,6 @@ H5Pget_fapl_onion(hid_t fapl_id, H5FD_onion_fapl_info_t *fa_out) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*!", fapl_id, fa_out); if (NULL == fa_out) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL info-out pointer"); @@ -323,7 +322,6 @@ H5Pset_fapl_onion(hid_t fapl_id, const H5FD_onion_fapl_info_t *fa) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*!", fapl_id, fa); if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Not a valid FAPL ID"); @@ -1667,7 +1665,6 @@ H5FDonion_get_revision_count(const char *filename, hid_t fapl_id, uint64_t *revi herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*si*UL", filename, fapl_id, revision_count); /* Check args */ if (!filename || !strcmp(filename, "")) diff --git a/src/H5FDperform.c b/src/H5FDperform.c index f07abd44ec7..7d9f49afdd5 100644 --- a/src/H5FDperform.c +++ b/src/H5FDperform.c @@ -40,7 +40,6 @@ H5FDperform_init(H5FD_init_t op) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API_NOINIT - /*NO TRACE*/ /* It is possible that an application will evaluate an * `H5FD_*` symbol (`H5FD_FAMILY`, `H5FD_MULTI`, `H5FD_SEC2`, etc. diff --git a/src/H5FDros3.c b/src/H5FDros3.c index 321a0a0d9bb..9427409e4ed 100644 --- a/src/H5FDros3.c +++ b/src/H5FDros3.c @@ -380,7 +380,6 @@ H5Pset_fapl_ros3(hid_t fapl_id, const H5FD_ros3_fapl_t *fa) herr_t ret_value = FAIL; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*#", fapl_id, fa); assert(fa != NULL); @@ -459,7 +458,6 @@ H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_dst /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*#", fapl_id, fa_dst); #if ROS3_DEBUG fprintf(stdout, "H5Pget_fapl_ros3() called.\n"); @@ -608,7 +606,6 @@ H5Pget_fapl_ros3_token(hid_t fapl_id, size_t size, char *token_dst /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iz*s", fapl_id, size, token_dst); #if ROS3_DEBUG fprintf(stdout, "H5Pget_fapl_ros3_token() called.\n"); @@ -794,7 +791,6 @@ H5Pset_fapl_ros3_token(hid_t fapl_id, const char *token) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", fapl_id, token); #if ROS3_DEBUG fprintf(stdout, "H5Pset_fapl_ros3_token() called.\n"); diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 274a8ad3462..db1dc275b2b 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -258,7 +258,6 @@ H5Pset_fapl_sec2(hid_t fapl_id) herr_t ret_value; FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", fapl_id); if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list"); diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c index a4a8eaacb69..434f870407f 100644 --- a/src/H5FDsplitter.c +++ b/src/H5FDsplitter.c @@ -287,7 +287,6 @@ H5Pset_fapl_splitter(hid_t fapl_id, H5FD_splitter_vfd_config_t *vfd_config) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*#", fapl_id, vfd_config); H5FD_SPLITTER_LOG_CALL(__func__); @@ -335,7 +334,6 @@ H5Pget_fapl_splitter(hid_t fapl_id, H5FD_splitter_vfd_config_t *config /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*#", fapl_id, config); H5FD_SPLITTER_LOG_CALL(__func__); diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index 11975bf709c..00971e44bfb 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -292,8 +292,6 @@ H5Pset_fapl_stdio(hid_t fapl_id) { static const char *func = "H5FDset_fapl_stdio"; /*for error reporting*/ - /*NO TRACE*/ - /* Clear the error stack */ H5Eclear2(H5E_DEFAULT); diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c index 9b37463fec2..7971050b1c4 100644 --- a/src/H5FDsubfiling/H5FDsubfiling.c +++ b/src/H5FDsubfiling/H5FDsubfiling.c @@ -478,8 +478,6 @@ H5Pset_fapl_subfiling(hid_t fapl_id, const H5FD_subfiling_config_t *vfd_config) MPI_Info info = MPI_INFO_NULL; herr_t ret_value = SUCCEED; - /*NO TRACE*/ - /* Ensure Subfiling (and therefore MPI) is initialized before doing anything */ if (H5FD_subfiling_init() < 0) H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize subfiling VFD"); @@ -560,8 +558,6 @@ H5Pget_fapl_subfiling(hid_t fapl_id, H5FD_subfiling_config_t *config_out) bool use_default_config = false; herr_t ret_value = SUCCEED; - /*NO TRACE*/ - if (config_out == NULL) H5_SUBFILING_GOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_out is NULL"); diff --git a/src/H5FDwindows.c b/src/H5FDwindows.c index 71078cdc95c..74389db913d 100644 --- a/src/H5FDwindows.c +++ b/src/H5FDwindows.c @@ -43,7 +43,6 @@ H5Pset_fapl_windows(hid_t fapl_id) herr_t ret_value; FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", fapl_id); if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list"); diff --git a/src/H5Fdeprec.c b/src/H5Fdeprec.c index 40e5ec3063d..06141de767b 100644 --- a/src/H5Fdeprec.c +++ b/src/H5Fdeprec.c @@ -93,7 +93,6 @@ H5Fget_info1(hid_t obj_id, H5F_info1_t *finfo /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*!", obj_id, finfo); /* Check args */ if (!finfo) @@ -149,7 +148,6 @@ H5Fis_hdf5(const char *name) htri_t ret_value; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE1("t", "*s", name); /* Check args and all the boring stuff. */ if (!name || !*name) @@ -214,7 +212,6 @@ H5Fset_latest_format(hid_t file_id, hbool_t latest_format) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", file_id, latest_format); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c index 805029f3ca6..4e6ca64253d 100644 --- a/src/H5Fmpi.c +++ b/src/H5Fmpi.c @@ -255,7 +255,6 @@ H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", file_id, flag); /* Get the file object */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) @@ -326,7 +325,6 @@ H5Fget_mpi_atomicity(hid_t file_id, bool *flag /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", file_id, flag); /* Get the file object */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(file_id, H5I_FILE))) diff --git a/src/H5G.c b/src/H5G.c index 7679da7d80a..ede81551b9c 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -224,7 +224,6 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t g hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE5("i", "i*siii", loc_id, name, lcpl_id, gcpl_id, gapl_id); /* Create the group synchronously */ if ((ret_value = H5G__create_api_common(loc_id, name, lcpl_id, gcpl_id, gapl_id, NULL, NULL)) < 0) @@ -254,8 +253,6 @@ H5Gcreate_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE9("i", "*s*sIui*siiii", app_file, app_func, app_line, loc_id, name, lcpl_id, gcpl_id, gapl_id, - es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -322,7 +319,6 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "iii", loc_id, gcpl_id, gapl_id); /* Check group property list */ if (H5P_DEFAULT == gcpl_id) @@ -435,7 +431,6 @@ H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "i*si", loc_id, name, gapl_id); /* Open the group synchronously */ if ((ret_value = H5G__open_api_common(loc_id, name, gapl_id, NULL, NULL)) < 0) @@ -465,7 +460,6 @@ H5Gopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, gapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -511,7 +505,6 @@ H5Gget_create_plist(hid_t group_id) hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", group_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(group_id, H5I_GROUP))) @@ -591,7 +584,6 @@ H5Gget_info(hid_t loc_id, H5G_info_t *group_info /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*GI", loc_id, group_info); /* Retrieve group information synchronously */ if (H5G__get_info_api_common(loc_id, group_info, NULL, NULL) < 0) @@ -620,7 +612,6 @@ H5Gget_info_async(const char *app_file, const char *app_func, unsigned app_line, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "*s*sIui*GIi", app_file, app_func, app_line, loc_id, group_info, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -699,7 +690,6 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *group_info /*out herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*s*GIi", loc_id, name, group_info, lapl_id); /* Retrieve group information synchronously */ if (H5G__get_info_by_name_api_common(loc_id, name, group_info, lapl_id, NULL, NULL) < 0) @@ -728,7 +718,6 @@ H5Gget_info_by_name_async(const char *app_file, const char *app_func, unsigned a herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "*s*sIui*s*GIii", app_file, app_func, app_line, loc_id, name, group_info, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -809,7 +798,6 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5 herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sIiIoh*GIi", loc_id, group_name, idx_type, order, n, group_info, lapl_id); /* Retrieve group information synchronously */ if (H5G__get_info_by_idx_api_common(loc_id, group_name, idx_type, order, n, group_info, lapl_id, NULL, @@ -840,8 +828,6 @@ H5Gget_info_by_idx_async(const char *app_file, const char *app_func, unsigned ap herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE11("e", "*s*sIui*sIiIoh*GIii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, - n, group_info, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -880,7 +866,6 @@ H5Gclose(hid_t group_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", group_id); /* Check arguments */ if (H5I_GROUP != H5I_get_type(group_id)) @@ -915,7 +900,6 @@ H5Gclose_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, group_id, es_id); /* Check arguments */ if (H5I_GROUP != H5I_get_type(group_id)) @@ -974,7 +958,6 @@ H5Gflush(hid_t group_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", group_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(group_id, H5I_GROUP))) @@ -1013,7 +996,6 @@ H5Grefresh(hid_t group_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", group_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(group_id, H5I_GROUP))) diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 19493ace078..90bde8432c3 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -159,7 +159,6 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "i*sz", loc_id, name, size_hint); /* Check arguments */ if (!name || !*name) @@ -253,7 +252,6 @@ H5Gopen1(hid_t loc_id, const char *name) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "i*s", loc_id, name); /* Check args */ if (!name || !*name) @@ -299,7 +297,6 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iLl*s*s", cur_loc_id, type, cur_name, new_name); /* Check arguments */ if (!cur_name || !*cur_name) @@ -388,7 +385,6 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, hid_t new_loc_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*sLli*s", cur_loc_id, cur_name, type, new_loc_id, new_name); /* Check arguments */ if (!cur_name || !*cur_name) @@ -482,7 +478,6 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*s", src_loc_id, src_name, dst_name); /* Set up collective metadata if appropriate */ if (H5CX_set_loc(src_loc_id) < 0) @@ -527,7 +522,6 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *d herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*si*s", src_loc_id, src_name, dst_loc_id, dst_name); /* Set up collective metadata if appropriate */ if (H5CX_set_loc(dst_loc_id) < 0) @@ -579,7 +573,6 @@ H5Gunlink(hid_t loc_id, const char *name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", loc_id, name); /* Check arguments */ if (!name || !*name) @@ -626,7 +619,6 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*sz*s", loc_id, name, size, buf); /* Check arguments */ if (!name || !*name) @@ -683,7 +675,6 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*s", loc_id, name, comment); if (!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified"); @@ -747,7 +738,6 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf /*out*/ int ret_value; /* Return value */ FUNC_ENTER_API(-1) - H5TRACE4("Is", "i*sz*s", loc_id, name, bufsize, buf); if (!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, -1, "no name specified"); @@ -821,7 +811,6 @@ H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op, void *o herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*s*IsGi*x", loc_id, name, idx_p, op, op_data); /* Check args */ if (!name || !*name) @@ -883,7 +872,6 @@ H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", loc_id, num_objs); /* Check args */ id_type = H5I_get_type(loc_id); @@ -932,7 +920,6 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, H5G_stat_t * herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*sb*Gs", loc_id, name, follow_link, statbuf); /* Check arguments */ if (!name || !*name) @@ -1147,7 +1134,6 @@ H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name /*out*/, size_t size ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("Zs", "ih*sz", loc_id, idx, name, size); /* Set up collective metadata if appropriate */ if (H5CX_set_loc(loc_id) < 0) @@ -1205,7 +1191,6 @@ H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx) H5G_obj_t ret_value; /* Return value */ FUNC_ENTER_API(H5G_UNKNOWN) - H5TRACE2("Go", "ih", loc_id, idx); /* Set location parameters */ loc_params.type = H5VL_OBJECT_BY_IDX; diff --git a/src/H5I.c b/src/H5I.c index a5d3b39f130..9202be2fa4d 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -90,14 +90,13 @@ static int H5I__iterate_pub_cb(void *obj, hid_t id, void *udata); *------------------------------------------------------------------------- */ H5I_type_t -H5Iregister_type(size_t H5_ATTR_DEBUG_API_USED hash_size, unsigned reserved, H5I_free_t free_func) +H5Iregister_type(size_t H5_ATTR_UNUSED hash_size, unsigned reserved, H5I_free_t free_func) { H5I_class_t *cls = NULL; /* New ID class */ H5I_type_t new_type = H5I_BADID; /* New ID type value */ H5I_type_t ret_value = H5I_BADID; /* Return value */ FUNC_ENTER_API(H5I_BADID) - H5TRACE3("It", "zIuIf", hash_size, reserved, free_func); /* Generate a new H5I_type_t value */ @@ -167,7 +166,6 @@ H5Itype_exists(H5I_type_t type) htri_t ret_value = true; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "It", type); /* Validate parameter */ if (H5I_IS_LIB_TYPE(type)) @@ -200,7 +198,6 @@ H5Inmembers(H5I_type_t type, hsize_t *num_members) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "It*h", type, num_members); if (H5I_IS_LIB_TYPE(type)) HGOTO_ERROR(H5E_ID, H5E_BADGROUP, FAIL, "cannot call public function on library type"); @@ -244,7 +241,6 @@ H5Iclear_type(H5I_type_t type, hbool_t force) herr_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "Itb", type, force); if (H5I_IS_LIB_TYPE(type)) HGOTO_ERROR(H5E_ID, H5E_BADGROUP, FAIL, "cannot call public function on library type"); @@ -274,7 +270,6 @@ H5Idestroy_type(H5I_type_t type) herr_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "It", type); if (H5I_IS_LIB_TYPE(type)) HGOTO_ERROR(H5E_ID, H5E_BADGROUP, FAIL, "cannot call public function on library type"); @@ -301,7 +296,6 @@ H5Iregister(H5I_type_t type, const void *object) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "It*x", type, object); if (H5I_IS_LIB_TYPE(type)) HGOTO_ERROR(H5E_ID, H5E_BADGROUP, H5I_INVALID_HID, "cannot call public function on library type"); @@ -331,7 +325,6 @@ H5Iregister_future(H5I_type_t type, const void *object, H5I_future_realize_func_ hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE4("i", "It*xIRID", type, object, realize_cb, discard_cb); /* Check arguments */ if (NULL == realize_cb) @@ -366,7 +359,6 @@ H5Iobject_verify(hid_t id, H5I_type_t type) void *ret_value = NULL; /* Return value */ FUNC_ENTER_API(NULL) - H5TRACE2("*x", "iIt", id, type); /* Validate parameters */ if (H5I_IS_LIB_TYPE(type)) @@ -401,7 +393,6 @@ H5Iget_type(hid_t id) H5I_type_t ret_value = H5I_BADID; /* Return value */ FUNC_ENTER_API(H5I_BADID) - H5TRACE1("It", "i", id); ret_value = H5I_get_type(id); @@ -432,7 +423,6 @@ H5Iremove_verify(hid_t id, H5I_type_t type) void *ret_value = NULL; /* Return value */ FUNC_ENTER_API(NULL) - H5TRACE2("*x", "iIt", id, type); if (H5I_IS_LIB_TYPE(type)) HGOTO_ERROR(H5E_ID, H5E_BADGROUP, NULL, "cannot call public function on library type"); @@ -462,7 +452,6 @@ H5Idec_ref(hid_t id) int ret_value = 0; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE1("Is", "i", id); /* Check arguments */ if (id < 0) @@ -492,7 +481,6 @@ H5Iinc_ref(hid_t id) int ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE1("Is", "i", id); /* Check arguments */ if (id < 0) @@ -522,7 +510,6 @@ H5Iget_ref(hid_t id) int ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE1("Is", "i", id); /* Check arguments */ if (id < 0) @@ -552,7 +539,6 @@ H5Iinc_type_ref(H5I_type_t type) int ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE1("Is", "It", type); /* Check arguments */ if (type <= 0 || (int)type >= H5I_next_type_g) @@ -598,7 +584,6 @@ H5Idec_type_ref(H5I_type_t type) herr_t ret_value = 0; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE1("e", "It", type); if (H5I_IS_LIB_TYPE(type)) HGOTO_ERROR(H5E_ID, H5E_BADGROUP, (-1), "cannot call public function on library type"); @@ -625,7 +610,6 @@ H5Iget_type_ref(H5I_type_t type) int ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE1("Is", "It", type); /* Check arguments */ if (type <= 0 || (int)type >= H5I_next_type_g) @@ -658,7 +642,6 @@ H5Iis_valid(hid_t id) htri_t ret_value = true; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "i", id); /* Find the ID */ if (NULL == (info = H5I__find_id(id))) @@ -731,7 +714,6 @@ H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key) void *ret_value = NULL; /* Return value */ FUNC_ENTER_API(NULL) - H5TRACE3("*x", "ItIS*x", type, func, key); /* Check arguments */ if (H5I_IS_LIB_TYPE(type)) @@ -817,7 +799,6 @@ H5Iiterate(H5I_type_t type, H5I_iterate_func_t op, void *op_data) herr_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ItII*x", type, op, op_data); /* Set up udata struct */ int_udata.op = op; @@ -852,7 +833,6 @@ H5Iget_file_id(hid_t obj_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", obj_id); /* Get object type */ type = H5I_TYPE(obj_id); @@ -908,7 +888,6 @@ H5Iget_name(hid_t id, char *name /*out*/, size_t size) ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "i*sz", id, name, size); /* Get the object pointer */ if (NULL == (vol_obj = H5VL_vol_object(id))) diff --git a/src/H5L.c b/src/H5L.c index 49fe1ac4fd7..091296240b2 100644 --- a/src/H5L.c +++ b/src/H5L.c @@ -98,7 +98,6 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *ds herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id, lapl_id); /* Check arguments */ if (src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC) @@ -200,7 +199,6 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *ds herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id, lapl_id); /* Check arguments */ if (src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC) @@ -362,7 +360,6 @@ H5Lcreate_soft(const char *link_target, hid_t link_loc_id, const char *link_name herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*si*sii", link_target, link_loc_id, link_name, lcpl_id, lapl_id); /* Creates a soft link synchronously */ if (H5L__create_soft_api_common(link_target, link_loc_id, link_name, lcpl_id, lapl_id, NULL, NULL) < 0) @@ -391,8 +388,6 @@ H5Lcreate_soft_async(const char *app_file, const char *app_func, unsigned app_li herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*s*sIu*si*siii", app_file, app_func, app_line, link_target, link_loc_id, link_name, - lcpl_id, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -545,7 +540,6 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id, const c herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*si*sii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id, lapl_id); /* Creates a hard link synchronously */ if (H5L__create_hard_api_common(cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id, lapl_id, NULL, @@ -582,8 +576,6 @@ H5Lcreate_hard_async(const char *app_file, const char *app_func, unsigned app_li herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIui*si*siii", app_file, app_func, app_line, cur_loc_id, cur_name, new_loc_id, - new_name, lcpl_id, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -639,7 +631,6 @@ H5Lcreate_external(const char *file_name, const char *obj_name, hid_t link_loc_i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "*s*si*sii", file_name, obj_name, link_loc_id, link_name, lcpl_id, lapl_id); /* Check arguments */ if (!file_name || !*file_name) @@ -736,7 +727,6 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, con herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sLl*xzii", link_loc_id, link_name, link_type, udata, udata_size, lcpl_id, lapl_id); /* Check arguments */ if (!link_name || !*link_name) @@ -841,7 +831,6 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*si", loc_id, name, lapl_id); /* Delete a link synchronously */ if (H5L__delete_api_common(loc_id, name, lapl_id, NULL, NULL) < 0) @@ -870,7 +859,6 @@ H5Ldelete_async(const char *app_file, const char *app_func, unsigned app_line, h herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -963,7 +951,6 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id); /* Delete a link synchronously */ if (H5L__delete_by_idx_api_common(loc_id, group_name, idx_type, order, n, lapl_id, NULL, NULL) < 0) @@ -993,8 +980,6 @@ H5Ldelete_by_idx_async(const char *app_file, const char *app_func, unsigned app_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIui*sIiIohii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, n, - lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1042,7 +1027,6 @@ H5Lget_val(hid_t loc_id, const char *name, void *buf /*out*/, size_t size, hid_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*s*xzi", loc_id, name, buf, size, lapl_id); /* Check arguments */ if (!name || !*name) @@ -1100,7 +1084,6 @@ H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIoh*xzi", loc_id, group_name, idx_type, order, n, buf, size, lapl_id); /* Check arguments */ if (!group_name || !*group_name) @@ -1199,7 +1182,6 @@ H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id) htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("t", "i*si", loc_id, name, lapl_id); /* Synchronously check if a link exists */ exists = false; @@ -1231,7 +1213,6 @@ H5Lexists_async(const char *app_file, const char *app_func, unsigned app_line, h herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "*s*sIui*s*bii", app_file, app_func, app_line, loc_id, name, exists, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1272,7 +1253,6 @@ H5Lget_info2(hid_t loc_id, const char *name, H5L_info2_t *linfo /*out*/, hid_t l herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*s*!i", loc_id, name, linfo, lapl_id); /* Check arguments */ if (!name || !*name) @@ -1325,7 +1305,6 @@ H5Lget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sIiIoh*!i", loc_id, group_name, idx_type, order, n, linfo, lapl_id); /* Check arguments */ if (!group_name || !*group_name) @@ -1386,7 +1365,6 @@ H5Lregister(const H5L_class_t *cls) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*#", cls); /* Check args */ if (cls == NULL) @@ -1440,7 +1418,6 @@ H5Lunregister(H5L_type_t id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "Ll", id); /* Check args */ if (id < 0 || id > H5L_TYPE_MAX) @@ -1473,7 +1450,6 @@ H5Lis_registered(H5L_type_t id) htri_t ret_value = false; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "Ll", id); /* Check args */ if (id < 0 || id > H5L_TYPE_MAX) @@ -1515,7 +1491,6 @@ H5Lget_name_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5 ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE8("Zs", "i*sIiIoh*szi", loc_id, group_name, idx_type, order, n, name, size, lapl_id); /* Check arguments */ if (!group_name || !*group_name) @@ -1640,7 +1615,6 @@ H5Literate2(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iIiIo*hLI*x", group_id, idx_type, order, idx_p, op, op_data); /* Iterate over links synchronously */ if ((ret_value = H5L__iterate_api_common(group_id, idx_type, order, idx_p, op, op_data, NULL, NULL)) < 0) @@ -1677,8 +1651,6 @@ H5Literate_async(const char *app_file, const char *app_func, unsigned app_line, herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIuiIiIo*hLI*xi", app_file, app_func, app_line, group_id, idx_type, order, idx_p, op, - op_data, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1730,7 +1702,6 @@ H5Literate_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIo*hLI*xi", loc_id, group_name, idx_type, order, idx_p, op, op_data, lapl_id); /* Check arguments */ if (!group_name) @@ -1811,7 +1782,6 @@ H5Lvisit2(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterat herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iIiIoLI*x", group_id, idx_type, order, op, op_data); /* Check args */ id_type = H5I_get_type(group_id); @@ -1885,7 +1855,6 @@ H5Lvisit_by_name2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_ herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sIiIoLI*xi", loc_id, group_name, idx_type, order, op, op_data, lapl_id); /* Check args */ if (!group_name) @@ -1962,7 +1931,6 @@ H5Lunpack_elink_val(const void *_ext_linkval, size_t link_size, unsigned *flags, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*xz*Iu**s**s", _ext_linkval, link_size, flags, filename, obj_path); /* Sanity check external link buffer */ if (ext_linkval == NULL) diff --git a/src/H5Ldeprec.c b/src/H5Ldeprec.c index f057538130c..c5f8470c912 100644 --- a/src/H5Ldeprec.c +++ b/src/H5Ldeprec.c @@ -149,7 +149,6 @@ H5Literate1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iIiIo*hLi*x", group_id, idx_type, order, idx_p, op, op_data); /* Check arguments */ id_type = H5I_get_type(group_id); @@ -231,7 +230,6 @@ H5Literate_by_name1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIo*hLi*xi", loc_id, group_name, idx_type, order, idx_p, op, op_data, lapl_id); /* Check arguments */ if (!group_name) @@ -311,7 +309,6 @@ H5Lget_info1(hid_t loc_id, const char *name, H5L_info1_t *linfo /*out*/, hid_t l herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*s*!i", loc_id, name, linfo, lapl_id); /* Check arguments */ if (!name || !*name) @@ -396,7 +393,6 @@ H5Lget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sIiIoh*!i", loc_id, group_name, idx_type, order, n, linfo, lapl_id); /* Check arguments */ if (!group_name || !*group_name) @@ -502,7 +498,6 @@ H5Lvisit1(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, H5L_iterat herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iIiIoLi*x", group_id, idx_type, order, op, op_data); /* Check args */ id_type = H5I_get_type(group_id); @@ -591,7 +586,6 @@ H5Lvisit_by_name1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_ herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sIiIoLi*xi", loc_id, group_name, idx_type, order, op, op_data, lapl_id); /* Check args */ if (!group_name) diff --git a/src/H5M.c b/src/H5M.c index 49842494852..b196f0930b8 100644 --- a/src/H5M.c +++ b/src/H5M.c @@ -294,7 +294,6 @@ H5Mcreate(hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "i*siiiii", loc_id, name, key_type_id, val_type_id, lcpl_id, mcpl_id, mapl_id); /* Create the map synchronously */ if ((ret_value = H5M__create_api_common(loc_id, name, key_type_id, val_type_id, lcpl_id, mcpl_id, mapl_id, @@ -327,8 +326,6 @@ H5Mcreate_async(const char *app_file, const char *app_func, unsigned app_line, h hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE11("i", "*s*sIui*siiiiii", app_file, app_func, app_line, loc_id, name, key_type_id, val_type_id, - lcpl_id, mcpl_id, mapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -388,7 +385,6 @@ H5Mcreate_anon(hid_t loc_id, hid_t key_type_id, hid_t val_type_id, hid_t mcpl_id hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE5("i", "iiiii", loc_id, key_type_id, val_type_id, mcpl_id, mapl_id); /* Check arguments */ if (H5P_DEFAULT == mcpl_id) @@ -527,7 +523,6 @@ H5Mopen(hid_t loc_id, const char *name, hid_t mapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "i*si", loc_id, name, mapl_id); /* Open the map synchronously */ if ((ret_value = H5M__open_api_common(loc_id, name, mapl_id, NULL, NULL)) < 0) @@ -558,7 +553,6 @@ H5Mopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, mapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -600,7 +594,6 @@ H5Mclose(hid_t map_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", map_id); /* Check args */ if (H5I_MAP != H5I_get_type(map_id)) @@ -635,7 +628,6 @@ H5Mclose_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, map_id, es_id); /* Check args */ if (H5I_MAP != H5I_get_type(map_id)) @@ -699,7 +691,6 @@ H5Mget_key_type(hid_t map_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", map_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP))) @@ -744,7 +735,6 @@ H5Mget_val_type(hid_t map_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", map_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP))) @@ -789,7 +779,6 @@ H5Mget_create_plist(hid_t map_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", map_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP))) @@ -837,7 +826,6 @@ H5Mget_access_plist(hid_t map_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", map_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP))) @@ -881,7 +869,6 @@ H5Mget_count(hid_t map_id, hsize_t *count /*out*/, hid_t dxpl_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("e", "i*hi", map_id, count, dxpl_id); /* Check args */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP))) @@ -988,7 +975,6 @@ H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "ii*xi*xi", map_id, key_mem_type_id, key, val_mem_type_id, value, dxpl_id); /* Add key-value pair to the map synchronously */ if ((ret_value = H5M__put_api_common(map_id, key_mem_type_id, key, val_mem_type_id, value, dxpl_id, NULL, @@ -1019,8 +1005,6 @@ H5Mput_async(const char *app_file, const char *app_func, unsigned app_line, hid_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIuii*xi*xii", app_file, app_func, app_line, map_id, key_mem_type_id, key, - val_mem_type_id, value, dxpl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1123,7 +1107,6 @@ H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "ii*xi*xi", map_id, key_mem_type_id, key, val_mem_type_id, value, dxpl_id); /* Get key-value pair from the map synchronously */ if ((ret_value = H5M__get_api_common(map_id, key_mem_type_id, key, val_mem_type_id, value, dxpl_id, NULL, @@ -1154,8 +1137,6 @@ H5Mget_async(const char *app_file, const char *app_func, unsigned app_line, hid_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIuii*xi*xii", app_file, app_func, app_line, map_id, key_mem_type_id, key, - val_mem_type_id, value, dxpl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1200,7 +1181,6 @@ H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, hbool_t *exists, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "ii*x*bi", map_id, key_mem_type_id, key, exists, dxpl_id); /* Check arguments */ if (key_mem_type_id < 0) @@ -1275,7 +1255,6 @@ H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*hiMI*xi", map_id, idx, key_mem_type_id, op, op_data, dxpl_id); /* Check arguments */ if (key_mem_type_id < 0) @@ -1357,7 +1336,6 @@ H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx, hid_t key_m herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*s*hiMI*xii", loc_id, map_name, idx, key_mem_type_id, op, op_data, dxpl_id, lapl_id); /* Check arguments */ if (!map_name) @@ -1428,7 +1406,6 @@ H5Mdelete(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t dxpl_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "ii*xi", map_id, key_mem_type_id, key, dxpl_id); /* Check arguments */ if (key_mem_type_id < 0) diff --git a/src/H5O.c b/src/H5O.c index 706a8ec4a36..26340aa567a 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -152,7 +152,6 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id) hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "i*si", loc_id, name, lapl_id); /* Open the object synchronously */ if ((ret_value = H5O__open_api_common(loc_id, name, lapl_id, NULL, NULL)) < 0) @@ -182,7 +181,6 @@ H5Oopen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -278,7 +276,6 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_ite hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE6("i", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id); /* Open the object synchronously */ if ((ret_value = @@ -310,8 +307,6 @@ H5Oopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_li hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE10("i", "*s*sIui*sIiIohii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, n, - lapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -358,7 +353,6 @@ H5Oopen_by_token(hid_t loc_id, H5O_token_t token) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "ik", loc_id, token); /* Check args */ if (H5O_IS_TOKEN_UNDEF(token)) @@ -537,7 +531,6 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *ds herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, ocpypl_id, lcpl_id); /* To copy an object synchronously */ if (H5O__copy_api_common(src_loc_id, src_name, dst_loc_id, dst_name, ocpypl_id, lcpl_id, NULL, NULL) < 0) @@ -567,8 +560,6 @@ H5Ocopy_async(const char *app_file, const char *app_func, unsigned app_line, hid herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIui*si*siii", app_file, app_func, app_line, src_loc_id, src_name, dst_loc_id, - dst_name, ocpypl_id, lcpl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -644,7 +635,6 @@ H5Oflush(hid_t obj_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", obj_id); /* To flush an object synchronously */ if (H5O__flush_api_common(obj_id, NULL, NULL) < 0) @@ -672,7 +662,6 @@ H5Oflush_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, obj_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -747,7 +736,6 @@ H5Orefresh(hid_t oid) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", oid); /* To refresh an object synchronously */ if (H5O__refresh_api_common(oid, NULL, NULL) < 0) @@ -775,7 +763,6 @@ H5Orefresh_async(const char *app_file, const char *app_func, unsigned app_line, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, oid, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -826,7 +813,6 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "ii*sii", obj_id, new_loc_id, new_name, lcpl_id, lapl_id); /* Check arguments */ if (new_loc_id == H5L_SAME_LOC) @@ -924,7 +910,6 @@ H5Oincr_refcount(hid_t object_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", object_id); loc_params.type = H5VL_OBJECT_BY_SELF; loc_params.obj_type = H5I_get_type(object_id); @@ -976,7 +961,6 @@ H5Odecr_refcount(hid_t object_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", object_id); loc_params.type = H5VL_OBJECT_BY_SELF; loc_params.obj_type = H5I_get_type(object_id); @@ -1022,7 +1006,6 @@ H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id) htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("t", "i*si", loc_id, name, lapl_id); /* Check args */ if (!name) @@ -1078,7 +1061,6 @@ H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo /*out*/, unsigned fields) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*!Iu", loc_id, oinfo, fields); /* Check args */ if (!oinfo) @@ -1170,7 +1152,6 @@ H5Oget_info_by_name3(hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*s*!Iui", loc_id, name, oinfo, fields, lapl_id); /* Retrieve object information synchronously */ if (H5O__get_info_by_name_api_common(loc_id, name, oinfo, fields, lapl_id, NULL, NULL) < 0) @@ -1200,8 +1181,6 @@ H5Oget_info_by_name_async(const char *app_file, const char *app_func, unsigned a herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*s*sIui*s*!Iuii", app_file, app_func, app_line, loc_id, name, oinfo, fields, lapl_id, - es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1244,7 +1223,6 @@ H5Oget_info_by_idx3(hid_t loc_id, const char *group_name, H5_index_t idx_type, H herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIoh*!Iui", loc_id, group_name, idx_type, order, n, oinfo, fields, lapl_id); /* Check args */ if (!group_name || !*group_name) @@ -1307,7 +1285,6 @@ H5Oget_native_info(hid_t loc_id, H5O_native_info_t *oinfo /*out*/, unsigned fiel herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*!Iu", loc_id, oinfo, fields); /* Check args */ if (!oinfo) @@ -1358,7 +1335,6 @@ H5Oget_native_info_by_name(hid_t loc_id, const char *name, H5O_native_info_t *oi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*s*!Iui", loc_id, name, oinfo, fields, lapl_id); /* Check args */ if (!name) @@ -1421,7 +1397,6 @@ H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIoh*!Iui", loc_id, group_name, idx_type, order, n, oinfo, fields, lapl_id); /* Check args */ if (!group_name || !*group_name) @@ -1491,7 +1466,6 @@ H5Oset_comment(hid_t obj_id, const char *comment) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", obj_id, comment); /* Get the location object */ if (NULL == (vol_obj = H5VL_vol_object(obj_id))) @@ -1543,7 +1517,6 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, hid_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*s*si", loc_id, name, comment, lapl_id); /* Check args */ if (!name || !*name) @@ -1601,7 +1574,6 @@ H5Oget_comment(hid_t obj_id, char *comment /*out*/, size_t bufsize) ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "i*sz", obj_id, comment, bufsize); /* Get the object */ if (NULL == (vol_obj = H5VL_vol_object(obj_id))) @@ -1654,7 +1626,6 @@ H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment /*out*/, si ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE5("Zs", "i*s*szi", loc_id, name, comment, bufsize, lapl_id); /* Check args */ if (!name || !*name) @@ -1735,7 +1706,6 @@ H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate2 herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iIiIoOI*xIu", obj_id, idx_type, order, op, op_data, fields); /* Check args */ if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N) @@ -1814,7 +1784,6 @@ H5Ovisit_by_name3(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_it herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIoOI*xIui", loc_id, obj_name, idx_type, order, op, op_data, fields, lapl_id); /* Check args */ if (!obj_name) @@ -1932,7 +1901,6 @@ H5Oclose(hid_t object_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", object_id); /* Validate the object type before closing */ if (H5O__close_check_type(object_id) <= 0) @@ -1964,7 +1932,6 @@ H5Oclose_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, object_id, es_id); /* Validate the object type before closing */ if (H5O__close_check_type(object_id) <= 0) @@ -2049,7 +2016,6 @@ H5Odisable_mdc_flushes(hid_t object_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", object_id); /* Make sure the ID is a file object */ if (H5I_is_file_object(object_id) != true) @@ -2119,7 +2085,6 @@ H5Oenable_mdc_flushes(hid_t object_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", object_id); /* Make sure the ID is a file object */ if (H5I_is_file_object(object_id) != true) @@ -2195,7 +2160,6 @@ H5Oare_mdc_flushes_disabled(hid_t object_id, bool *are_disabled) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", object_id, are_disabled); /* Sanity check */ if (!are_disabled) @@ -2249,7 +2213,6 @@ H5Otoken_cmp(hid_t loc_id, const H5O_token_t *token1, const H5O_token_t *token2, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*k*k*Is", loc_id, token1, token2, cmp_value); /* Get the location object */ if (NULL == (vol_obj = H5VL_vol_object(loc_id))) @@ -2283,7 +2246,6 @@ H5Otoken_to_str(hid_t loc_id, const H5O_token_t *token, char **token_str) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*k**s", loc_id, token, token_str); /* Get the location object */ if (NULL == (vol_obj = H5VL_vol_object(loc_id))) @@ -2323,7 +2285,6 @@ H5Otoken_from_str(hid_t loc_id, const char *token_str, H5O_token_t *token) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*k", loc_id, token_str, token); /* Get the location object */ if (NULL == (vol_obj = H5VL_vol_object(loc_id))) diff --git a/src/H5Odeprec.c b/src/H5Odeprec.c index 3dd01f4029d..f74ec542d6f 100644 --- a/src/H5Odeprec.c +++ b/src/H5Odeprec.c @@ -345,7 +345,6 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "ia", loc_id, addr); /* Get the location object */ if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id))) @@ -405,7 +404,6 @@ H5Oget_info1(hid_t loc_id, H5O_info1_t *oinfo /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*!", loc_id, oinfo); /* Check args */ if (!oinfo) @@ -455,7 +453,6 @@ H5Oget_info_by_name1(hid_t loc_id, const char *name, H5O_info1_t *oinfo /*out*/, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*s*!i", loc_id, name, oinfo, lapl_id); /* Check args */ if (!name) @@ -517,7 +514,6 @@ H5Oget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index_t idx_type, H herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sIiIoh*!i", loc_id, group_name, idx_type, order, n, oinfo, lapl_id); /* Check args */ if (!group_name || !*group_name) @@ -582,7 +578,6 @@ H5Oget_info2(hid_t loc_id, H5O_info1_t *oinfo /*out*/, unsigned fields) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*!Iu", loc_id, oinfo, fields); /* Check args */ if (!oinfo) @@ -635,7 +630,6 @@ H5Oget_info_by_name2(hid_t loc_id, const char *name, H5O_info1_t *oinfo /*out*/, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*s*!Iui", loc_id, name, oinfo, fields, lapl_id); /* Check args */ if (!name) @@ -700,7 +694,6 @@ H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index_t idx_type, H herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIoh*!Iui", loc_id, group_name, idx_type, order, n, oinfo, fields, lapl_id); /* Check args */ if (!group_name || !*group_name) @@ -786,7 +779,6 @@ H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate1 bool is_native_vol_obj = false; FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iIiIoOi*x", obj_id, idx_type, order, op, op_data); /* Check args */ if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N) @@ -876,7 +868,6 @@ H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_it bool is_native_vol_obj = false; FUNC_ENTER_API(FAIL) - H5TRACE7("e", "i*sIiIoOi*xi", loc_id, obj_name, idx_type, order, op, op_data, lapl_id); /* Check args */ if (!obj_name) @@ -979,7 +970,6 @@ H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate1 herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iIiIoOi*xIu", obj_id, idx_type, order, op, op_data, fields); /* Check args */ if (idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N) @@ -1074,7 +1064,6 @@ H5Ovisit_by_name2(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_it herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "i*sIiIoOi*xIui", loc_id, obj_name, idx_type, order, op, op_data, fields, lapl_id); /* Check args */ if (!obj_name) diff --git a/src/H5P.c b/src/H5P.c index fc361e8788e..918a833a4bc 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -88,7 +88,6 @@ H5Pcopy(hid_t id) hid_t ret_value = H5I_INVALID_HID; /* return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", id); if (H5P_DEFAULT == id) HGOTO_DONE(H5P_DEFAULT); @@ -168,8 +167,6 @@ H5Pcreate_class(hid_t parent, const char *name, H5P_cls_create_func_t cls_create hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE8("i", "i*sPc*xPo*xPl*x", parent, name, cls_create, create_data, cls_copy, copy_data, cls_close, - close_data); /* Check arguments. */ if (H5P_DEFAULT != parent && (H5I_GENPROP_CLS != H5I_get_type(parent))) @@ -231,7 +228,6 @@ H5Pcreate(hid_t cls_id) hid_t ret_value = H5I_INVALID_HID; /* return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", cls_id); /* Check arguments. */ if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS))) @@ -409,8 +405,6 @@ H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_p herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE11("e", "i*sz*xPCPSPGPDPOPMPL", cls_id, name, size, def_value, prp_create, prp_set, prp_get, - prp_delete, prp_copy, prp_cmp, prp_close); /* Check arguments. */ if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS))) @@ -593,8 +587,6 @@ H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value, H5P_prp_s herr_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "i*sz*xPSPGPDPOPMPL", plist_id, name, size, value, prp_set, prp_get, prp_delete, prp_copy, - prp_cmp, prp_close); /* Check arguments. */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -651,7 +643,6 @@ H5Pset(hid_t plist_id, const char *name, const void *value) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*x", plist_id, name, value); /* Check arguments. */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -699,7 +690,6 @@ H5Pexist(hid_t id, const char *name) htri_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "i*s", id, name); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -758,7 +748,6 @@ H5Pget_size(hid_t id, const char *name, size_t *size /*out*/) herr_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*z", id, name, size); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -822,7 +811,6 @@ H5Pencode2(hid_t plist_id, void *buf, size_t *nalloc, hid_t fapl_id) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*x*zi", plist_id, buf, nalloc, fapl_id); /* Check arguments. */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -869,7 +857,6 @@ H5Pdecode(const void *buf) hid_t ret_value = H5I_INVALID_HID; /* return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "*x", buf); /* Call the internal decode routine */ if ((ret_value = H5P__decode(buf)) < 0) @@ -907,7 +894,6 @@ H5Pget_class(hid_t plist_id) hid_t ret_value = H5I_INVALID_HID; /* return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", plist_id); /* Check arguments. */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -963,7 +949,6 @@ H5Pget_nprops(hid_t id, size_t *nprops /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*z", id, nprops); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -1017,7 +1002,6 @@ H5Pequal(hid_t id1, hid_t id2) htri_t ret_value = false; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "ii", id1, id2); /* Check arguments. */ if ((H5I_GENPROP_LST != H5I_get_type(id1) && H5I_GENPROP_CLS != H5I_get_type(id1)) || @@ -1077,7 +1061,6 @@ H5Pisa_class(hid_t plist_id, hid_t pclass_id) htri_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "ii", plist_id, pclass_id); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(plist_id)) @@ -1194,7 +1177,6 @@ H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data) int ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("Is", "i*IsPi*x", id, idx, iter_func, iter_data); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -1263,7 +1245,6 @@ H5Pget(hid_t plist_id, const char *name, void *value /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*x", plist_id, name, value); /* Check arguments. */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -1314,7 +1295,6 @@ H5Premove(hid_t plist_id, const char *name) herr_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", plist_id, name); /* Check arguments. */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -1375,7 +1355,6 @@ H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*s", dst_id, src_id, name); /* Check arguments. */ if ((src_id_type = H5I_get_type(src_id)) < 0) @@ -1433,7 +1412,6 @@ H5Punregister(hid_t pclass_id, const char *name) herr_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", pclass_id, name); /* Check arguments. */ if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS))) @@ -1476,7 +1454,6 @@ H5Pclose(hid_t plist_id) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", plist_id); /* Allow default property lists to pass through without throwing an error */ if (H5P_DEFAULT != plist_id) { @@ -1520,7 +1497,6 @@ H5Pget_class_name(hid_t pclass_id) char *ret_value; /* return value */ FUNC_ENTER_API(NULL) - H5TRACE1("*s", "i", pclass_id); /* Check arguments. */ if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS))) @@ -1561,7 +1537,6 @@ H5Pget_class_parent(hid_t pclass_id) hid_t ret_value = H5I_INVALID_HID; /* return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", pclass_id); /* Check arguments. */ if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS))) @@ -1610,7 +1585,6 @@ H5Pclose_class(hid_t cls_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", cls_id); /* Check arguments */ if (H5I_GENPROP_CLS != H5I_get_type(cls_id)) diff --git a/src/H5PL.c b/src/H5PL.c index 218e413eced..b132721f732 100644 --- a/src/H5PL.c +++ b/src/H5PL.c @@ -77,7 +77,6 @@ H5PLset_loading_state(unsigned int plugin_control_mask) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "Iu", plugin_control_mask); /* Set the plugin control mask */ if (H5PL__set_plugin_control_mask(plugin_control_mask) < 0) @@ -109,7 +108,6 @@ H5PLget_loading_state(unsigned *plugin_control_mask /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*Iu", plugin_control_mask); if (NULL == plugin_control_mask) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_control_mask parameter cannot be NULL"); @@ -138,7 +136,6 @@ H5PLappend(const char *search_path) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*s", search_path); /* Check args */ if (NULL == search_path) @@ -170,7 +167,6 @@ H5PLprepend(const char *search_path) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*s", search_path); /* Check args */ if (NULL == search_path) @@ -203,7 +199,6 @@ H5PLreplace(const char *search_path, unsigned int idx) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "*sIu", search_path, idx); /* Check args */ if (NULL == search_path) @@ -245,7 +240,6 @@ H5PLinsert(const char *search_path, unsigned int idx) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "*sIu", search_path, idx); /* Check args */ if (NULL == search_path) @@ -287,7 +281,6 @@ H5PLremove(unsigned int idx) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "Iu", idx); /* Check index */ num_paths = H5PL__get_num_paths(); @@ -338,7 +331,6 @@ H5PLget(unsigned int idx, char *path_buf, size_t buf_size) ssize_t ret_value = 0; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("Zs", "Iu*sz", idx, path_buf, buf_size); /* Check index */ num_paths = H5PL__get_num_paths(); @@ -387,7 +379,6 @@ H5PLsize(unsigned int *num_paths) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*Iu", num_paths); /* Check arguments */ if (!num_paths) diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index 37386265085..07b1d84878f 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -762,7 +762,6 @@ H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "izzd", dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0); /* Check arguments. Note that we allow negative values - they are * considered to "unset" the property. */ @@ -810,7 +809,6 @@ H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots /*out*/, size_t *rdcc_nbyt herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*z*z*d", dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(dapl_id, H5P_DATASET_ACCESS))) @@ -1072,7 +1070,6 @@ H5Pset_virtual_view(hid_t plist_id, H5D_vds_view_t view) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iDv", plist_id, view); /* Check argument */ if ((view != H5D_VDS_FIRST_MISSING) && (view != H5D_VDS_LAST_AVAILABLE)) @@ -1108,7 +1105,6 @@ H5Pget_virtual_view(hid_t plist_id, H5D_vds_view_t *view /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Dv", plist_id, view); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) @@ -1214,7 +1210,6 @@ H5Pset_virtual_printf_gap(hid_t plist_id, hsize_t gap_size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ih", plist_id, gap_size); /* Check argument */ if (gap_size == HSIZE_UNDEF) @@ -1251,7 +1246,6 @@ H5Pget_virtual_printf_gap(hid_t plist_id, hsize_t *gap_size /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", plist_id, gap_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) @@ -1291,7 +1285,6 @@ H5Pset_append_flush(hid_t plist_id, unsigned ndims, const hsize_t *boundary, H5D herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iIu*hDA*x", plist_id, ndims, boundary, func, udata); /* Check arguments */ if (0 == ndims) @@ -1353,7 +1346,6 @@ H5Pget_append_flush(hid_t plist_id, unsigned ndims, hsize_t boundary[], H5D_appe herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iIu*h*DA**x", plist_id, ndims, boundary, func, udata); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) @@ -1403,7 +1395,6 @@ H5Pset_efile_prefix(hid_t plist_id, const char *prefix) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", plist_id, prefix); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) @@ -1436,7 +1427,6 @@ H5Pget_efile_prefix(hid_t plist_id, char *prefix /*out*/, size_t size) ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("Zs", "i*sz", plist_id, prefix, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) @@ -1491,7 +1481,6 @@ H5Pset_virtual_prefix(hid_t plist_id, const char *prefix) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", plist_id, prefix); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) @@ -1526,7 +1515,6 @@ H5Pget_virtual_prefix(hid_t plist_id, char *prefix /*out*/, size_t size) ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("Zs", "i*sz", plist_id, prefix, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 8f0ba04745d..a5b7872549d 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -1817,7 +1817,6 @@ H5Pset_layout(hid_t plist_id, H5D_layout_t layout_type) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iDl", plist_id, layout_type); /* Check arguments */ if (layout_type < 0 || layout_type >= H5D_NLAYOUTS) @@ -1878,7 +1877,6 @@ H5Pget_layout(hid_t plist_id) H5D_layout_t ret_value; /* Return value */ FUNC_ENTER_API(H5D_LAYOUT_ERROR) - H5TRACE1("Dl", "i", plist_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE))) @@ -1919,7 +1917,6 @@ H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/]) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iIs*[a1]h", plist_id, ndims, dim); /* Check arguments */ if (ndims <= 0) @@ -1979,7 +1976,6 @@ H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[] /*out*/) int ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("Is", "iIs*h", plist_id, max_ndims, dim); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE))) @@ -2038,7 +2034,6 @@ H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name, const herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "ii*s*si", dcpl_id, vspace_id, src_file_name, src_dset_name, src_space_id); /* Check arguments */ if (!src_file_name) @@ -2202,7 +2197,6 @@ H5Pget_virtual_count(hid_t dcpl_id, size_t *count /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*z", dcpl_id, count); if (count) { /* Get the plist structure */ @@ -2245,7 +2239,6 @@ H5Pget_virtual_vspace(hid_t dcpl_id, size_t idx) hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("i", "iz", dcpl_id, idx); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE))) @@ -2299,7 +2292,6 @@ H5Pget_virtual_srcspace(hid_t dcpl_id, size_t idx) hid_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("i", "iz", dcpl_id, idx); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE))) @@ -2399,7 +2391,6 @@ H5Pget_virtual_filename(hid_t dcpl_id, size_t idx, char *name /*out*/, size_t si ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("Zs", "iz*sz", dcpl_id, idx, name, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE))) @@ -2457,7 +2448,6 @@ H5Pget_virtual_dsetname(hid_t dcpl_id, size_t idx, char *name /*out*/, size_t si ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("Zs", "iz*sz", dcpl_id, idx, name, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE))) @@ -2501,7 +2491,6 @@ H5Pset_chunk_opts(hid_t plist_id, unsigned options) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, options); /* Check arguments */ if (options & ~(H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS)) @@ -2553,7 +2542,6 @@ H5Pget_chunk_opts(hid_t plist_id, unsigned *options /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, options); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE))) @@ -2607,7 +2595,6 @@ H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*soh", plist_id, name, offset, size); /* Check arguments */ if (!name || !*name) @@ -2675,7 +2662,6 @@ H5Pget_external_count(hid_t plist_id) int ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("Is", "i", plist_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE))) @@ -2722,7 +2708,6 @@ H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name /*out herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iIuz*s*o*h", plist_id, idx, name_size, name, offset, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE))) @@ -2779,7 +2764,6 @@ H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iIuIu", plist_id, options_mask, pixels_per_block); if (H5Z_get_filter_info(H5Z_FILTER_SZIP, &config_flags) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "can't get filter info"); @@ -2843,7 +2827,6 @@ H5Pset_shuffle(hid_t plist_id) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", plist_id); /* Check arguments */ if (true != H5P_isa_class(plist_id, H5P_DATASET_CREATE)) @@ -2882,7 +2865,6 @@ H5Pset_nbit(hid_t plist_id) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", plist_id); /* Check arguments */ if (true != H5P_isa_class(plist_id, H5P_DATASET_CREATE)) @@ -2938,7 +2920,6 @@ H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_fac herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iZaIs", plist_id, scale_type, scale_factor); /* Check arguments */ if (true != H5P_isa_class(plist_id, H5P_DATASET_CREATE)) @@ -2998,7 +2979,6 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*x", plist_id, type_id, value); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_CREATE))) @@ -3176,7 +3156,6 @@ H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*x", plist_id, type_id, value); /* Check arguments */ if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -3280,7 +3259,6 @@ H5Pfill_value_defined(hid_t plist_id, H5D_fill_value_t *status) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*DF", plist_id, status); assert(status); @@ -3316,7 +3294,6 @@ H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iDa", plist_id, alloc_time); /* Check arguments */ if (alloc_time < H5D_ALLOC_TIME_DEFAULT || alloc_time > H5D_ALLOC_TIME_INCR) @@ -3399,7 +3376,6 @@ H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Da", plist_id, alloc_time); /* Get values */ if (alloc_time) { @@ -3440,7 +3416,6 @@ H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iDf", plist_id, fill_time); /* Check arguments */ if (fill_time < H5D_FILL_TIME_ALLOC || fill_time > H5D_FILL_TIME_IFSET) @@ -3481,7 +3456,6 @@ H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Df", plist_id, fill_time); /* Set values */ if (fill_time) { @@ -3527,7 +3501,6 @@ H5Pget_dset_no_attrs_hint(hid_t dcpl_id, hbool_t *minimize /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", dcpl_id, minimize); if (NULL == minimize) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "receiving pointer cannot be NULL"); @@ -3568,7 +3541,6 @@ H5Pset_dset_no_attrs_hint(hid_t dcpl_id, hbool_t minimize) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", dcpl_id, minimize); plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE); if (NULL == plist) diff --git a/src/H5Pdeprec.c b/src/H5Pdeprec.c index 6e55c72b691..2888ad6012c 100644 --- a/src/H5Pdeprec.c +++ b/src/H5Pdeprec.c @@ -217,8 +217,6 @@ H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_p herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "i*sz*xPCPSPGPDPOPL", cls_id, name, size, def_value, prp_create, prp_set, prp_get, - prp_delete, prp_copy, prp_close); /* Check arguments. */ if (NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(cls_id, H5I_GENPROP_CLS))) @@ -401,8 +399,6 @@ H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value, H5P_prp_s herr_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "i*sz*xPSPGPDPOPL", plist_id, name, size, value, prp_set, prp_get, prp_delete, prp_copy, - prp_close); /* Check arguments. */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -449,7 +445,6 @@ H5Pget_version(hid_t plist_id, unsigned *super /*out*/, unsigned *freelist /*out herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*Iu*Iu*Iu*Iu", plist_id, super, freelist, stab, shhdr); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -499,7 +494,6 @@ H5Pencode1(hid_t plist_id, void *buf, size_t *nalloc) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*x*z", plist_id, buf, nalloc); /* Check arguments. */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -538,7 +532,6 @@ H5Pset_file_space(hid_t plist_id, H5F_file_space_type_t strategy, hsize_t thresh herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iFth", plist_id, strategy, threshold); if ((unsigned)in_strategy >= H5F_FILE_SPACE_NTYPES) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid strategy"); @@ -605,7 +598,6 @@ H5Pget_file_space(hid_t plist_id, H5F_file_space_type_t *strategy /*out*/, hsize herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Ft*h", plist_id, strategy, threshold); /* Get current file space info */ if (H5Pget_file_space_strategy(plist_id, &new_strategy, &new_persist, &new_threshold) < 0) diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index a2538810d38..bd53c3affd1 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -968,7 +968,6 @@ H5Pset_data_transform(hid_t plist_id, const char *expression) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", plist_id, expression); /* Check arguments */ if (expression == NULL) @@ -1031,7 +1030,6 @@ H5Pget_data_transform(hid_t plist_id, char *expression /*out*/, size_t size) ssize_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("Zs", "i*sz", plist_id, expression, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1086,7 +1084,6 @@ H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iz*x*x", plist_id, size, tconv, bkg); /* Check arguments */ if (size == 0) @@ -1127,7 +1124,6 @@ H5Pget_buffer(hid_t plist_id, void **tconv /*out*/, void **bkg /*out*/) size_t ret_value; /* Return value */ FUNC_ENTER_API(0) - H5TRACE3("z", "i**x**x", plist_id, tconv, bkg); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1173,7 +1169,6 @@ H5Pset_preserve(hid_t plist_id, hbool_t status) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", plist_id, status); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1207,7 +1202,6 @@ H5Pget_preserve(hid_t plist_id) int ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("Is", "i", plist_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1243,7 +1237,6 @@ H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iZe", plist_id, check); /* Check argument */ if (check != H5Z_ENABLE_EDC && check != H5Z_DISABLE_EDC) @@ -1280,7 +1273,6 @@ H5Pget_edc_check(hid_t plist_id) H5Z_EDC_t ret_value; /* Return value */ FUNC_ENTER_API(H5Z_ERROR_EDC) - H5TRACE1("Ze", "i", plist_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1313,7 +1305,6 @@ H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, void *op_data) H5Z_cb_t cb_struct; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iZF*x", plist_id, func, op_data); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1349,7 +1340,6 @@ H5Pset_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t op, void *operate_dat H5T_conv_cb_t cb_struct; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iTE*x", plist_id, op, operate_data); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1385,7 +1375,6 @@ H5Pget_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t *op /*out*/, void **o herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*TE**x", plist_id, op, operate_data); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1423,7 +1412,6 @@ H5Pget_btree_ratios(hid_t plist_id, double *left /*out*/, double *middle /*out*/ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*d*d*d", plist_id, left, middle, right); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1470,7 +1458,6 @@ H5Pset_btree_ratios(hid_t plist_id, double left, double middle, double right) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iddd", plist_id, left, middle, right); /* Check arguments */ if (left < 0.0 || left > 1.0 || middle < 0.0 || middle > 1.0 || right < 0.0 || right > 1.0) @@ -1557,7 +1544,6 @@ H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func, void *alloc_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iMa*xMf*x", plist_id, alloc_func, alloc_info, free_func, free_info); /* Check arguments */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1588,7 +1574,6 @@ H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func /*out*/, voi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*Ma**x*Mf**x", plist_id, alloc_func, alloc_info, free_func, free_info); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1636,7 +1621,6 @@ H5Pset_hyper_vector_size(hid_t plist_id, size_t vector_size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iz", plist_id, vector_size); /* Check arguments */ if (vector_size < 1) @@ -1670,7 +1654,6 @@ H5Pget_hyper_vector_size(hid_t plist_id, size_t *vector_size /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*z", plist_id, vector_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1902,7 +1885,6 @@ H5Pget_mpio_actual_chunk_opt_mode(hid_t plist_id, herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Do", plist_id, actual_chunk_opt_mode); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1934,7 +1916,6 @@ H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t *actual_io_ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Di", plist_id, actual_io_mode); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -1966,7 +1947,6 @@ H5Pget_mpio_no_collective_cause(hid_t plist_id, uint32_t *local_no_collective_ca herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Iu*Iu", plist_id, local_no_collective_cause, global_no_collective_cause); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -2268,7 +2248,6 @@ H5Pset_dataset_io_hyperslab_selection(hid_t plist_id, unsigned rank, H5S_seloper herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "iIuSs*h*h*h*h", plist_id, rank, op, start, stride, count, block); /* Check arguments */ if (rank < 1 || rank > H5S_MAX_RANK) @@ -2381,7 +2360,6 @@ H5Pset_selection_io(hid_t plist_id, H5D_selection_io_mode_t selection_io_mode) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iDC", plist_id, selection_io_mode); /* Check arguments */ if (plist_id == H5P_DEFAULT) @@ -2419,7 +2397,6 @@ H5Pget_selection_io(hid_t plist_id, H5D_selection_io_mode_t *selection_io_mode / herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*DC", plist_id, selection_io_mode); /* Check arguments */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -2450,7 +2427,6 @@ H5Pget_no_selection_io_cause(hid_t plist_id, uint32_t *no_selection_io_cause /*o herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, no_selection_io_cause); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -2483,7 +2459,6 @@ H5Pget_actual_selection_io_mode(hid_t plist_id, uint32_t *actual_selection_io_mo herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, actual_selection_io_mode); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) @@ -2581,7 +2556,6 @@ H5Pset_modify_write_buf(hid_t plist_id, hbool_t modify_write_buf) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", plist_id, modify_write_buf); /* Check arguments */ if (plist_id == H5P_DEFAULT) @@ -2615,7 +2589,6 @@ H5Pget_modify_write_buf(hid_t plist_id, hbool_t *modify_write_buf /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", plist_id, modify_write_buf); /* Check arguments */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER))) diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 80922bd9d1d..4799ee41607 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -1080,7 +1080,6 @@ H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ihh", fapl_id, threshold, alignment); /* Check args */ if (alignment < 1) @@ -1118,7 +1117,6 @@ H5Pget_alignment(hid_t fapl_id, hsize_t *threshold /*out*/, hsize_t *alignment / herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*h*h", fapl_id, threshold, alignment); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) @@ -1213,7 +1211,6 @@ H5Pset_driver(hid_t plist_id, hid_t new_driver_id, const void *new_driver_info) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*x", plist_id, new_driver_id, new_driver_info); /* Check arguments */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -1299,7 +1296,6 @@ H5Pset_driver_by_name(hid_t plist_id, const char *driver_name, const char *drive herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*s", plist_id, driver_name, driver_config); /* Check arguments */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -1387,7 +1383,6 @@ H5Pset_driver_by_value(hid_t plist_id, H5FD_class_value_t driver_value, const ch herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iDV*s", plist_id, driver_value, driver_config); /* Check arguments */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -1467,7 +1462,6 @@ H5Pget_driver(hid_t plist_id) hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("i", "i", plist_id); if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list"); @@ -1541,7 +1535,6 @@ H5Pget_driver_info(hid_t plist_id) const void *ret_value = NULL; /* Return value */ FUNC_ENTER_API(NULL) - H5TRACE1("*x", "i", plist_id); if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list"); @@ -1616,7 +1609,6 @@ H5Pget_driver_config_str(hid_t fapl_id, char *config_buf, size_t buf_size) ssize_t ret_value = -1; FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "i*sz", fapl_id, config_buf, buf_size); /* Check arguments */ if (!config_buf && buf_size) @@ -2005,7 +1997,6 @@ H5Pset_family_offset(hid_t fapl_id, hsize_t offset) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ih", fapl_id, offset); /* Get the plist structure */ if (H5P_DEFAULT == fapl_id) @@ -2040,7 +2031,6 @@ H5Pget_family_offset(hid_t fapl_id, hsize_t *offset /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", fapl_id, offset); /* Get the plist structure */ if (H5P_DEFAULT == fapl_id) @@ -2077,7 +2067,6 @@ H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iMt", fapl_id, type); /* Get the plist structure */ if (H5P_DEFAULT == fapl_id) @@ -2112,7 +2101,6 @@ H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Mt", fapl_id, type); /* Get the plist structure */ if (H5P_DEFAULT == fapl_id) @@ -2157,7 +2145,6 @@ H5Pset_cache(hid_t plist_id, int H5_ATTR_UNUSED mdc_nelmts, size_t rdcc_nslots, herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iIszzd", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes, rdcc_w0); /* Check arguments */ if (rdcc_w0 < 0.0 || rdcc_w0 > 1.0) @@ -2201,7 +2188,6 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts, size_t *rdcc_nslots /*out*/, size_ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*Is*z*z*d", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes, rdcc_w0); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2244,7 +2230,6 @@ H5Pset_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t *config_ptr) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*CC", plist_id, config_ptr); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2288,7 +2273,6 @@ H5Pget_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t *config /*out* herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*CC", plist_id, config); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2330,7 +2314,6 @@ H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Cc", plist_id, config_ptr); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2374,7 +2357,6 @@ H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Cc", plist_id, config); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2427,7 +2409,6 @@ H5Pset_gc_references(hid_t plist_id, unsigned gc_ref) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, gc_ref); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2458,7 +2439,6 @@ H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, gc_ref); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2489,7 +2469,6 @@ H5Pset_fclose_degree(hid_t plist_id, H5F_close_degree_t degree) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iFd", plist_id, degree); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2519,7 +2498,6 @@ H5Pget_fclose_degree(hid_t plist_id, H5F_close_degree_t *degree /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Fd", plist_id, degree); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2558,7 +2536,6 @@ H5Pset_meta_block_size(hid_t plist_id, hsize_t size) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ih", plist_id, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2589,7 +2566,6 @@ H5Pget_meta_block_size(hid_t plist_id, hsize_t *size /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", plist_id, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2631,7 +2607,6 @@ H5Pset_sieve_buf_size(hid_t plist_id, size_t size) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iz", plist_id, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2662,7 +2637,6 @@ H5Pget_sieve_buf_size(hid_t plist_id, size_t *size /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*z", plist_id, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2703,7 +2677,6 @@ H5Pset_small_data_block_size(hid_t plist_id, hsize_t size) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ih", plist_id, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2734,7 +2707,6 @@ H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", plist_id, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2858,7 +2830,6 @@ H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low, H5F_libver_t high) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iFvFv", plist_id, low, high); /* Check args */ if (low < 0 || low > H5F_LIBVER_LATEST) @@ -2904,7 +2875,6 @@ H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low /*out*/, H5F_libver_t *hi herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Fv*Fv", plist_id, low, high); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2943,7 +2913,6 @@ H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, efc_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -2977,7 +2946,6 @@ H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, efc_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -3010,7 +2978,6 @@ H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*xz", fapl_id, buf_ptr, buf_len); /* validate parameters */ if (!(((buf_ptr == NULL) && (buf_len == 0)) || ((buf_ptr != NULL) && (buf_len > 0)))) @@ -3104,7 +3071,6 @@ H5Pget_file_image(hid_t fapl_id, void **buf /*out*/, size_t *buf_len /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i**x*z", fapl_id, buf, buf_len); /* Get the plist structure */ if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) @@ -3177,7 +3143,6 @@ H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callback herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*DI", fapl_id, callbacks_ptr); /* Get the plist structure */ if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) @@ -3257,7 +3222,6 @@ H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callback herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*DI", fapl_id, callbacks); /* Get the plist structure */ if (NULL == (fapl = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) @@ -4417,7 +4381,6 @@ H5Pset_metadata_read_attempts(hid_t plist_id, unsigned attempts) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, attempts); /* Cannot set the # of attempts to 0 */ if (attempts == 0) @@ -4451,7 +4414,6 @@ H5Pget_metadata_read_attempts(hid_t plist_id, unsigned *attempts /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, attempts); /* Get values */ if (attempts) { @@ -4492,7 +4454,6 @@ H5Pset_object_flush_cb(hid_t plist_id, H5F_flush_cb_t func, void *udata) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iFF*x", plist_id, func, udata); /* Check if the callback function is NULL and the user data is non-NULL. * This is almost certainly an error as the user data will not be used. */ @@ -4533,7 +4494,6 @@ H5Pget_object_flush_cb(hid_t plist_id, H5F_flush_cb_t *func /*out*/, void **udat herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*FF**x", plist_id, func, udata); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -4570,7 +4530,6 @@ H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const char *location, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "ib*sb", plist_id, is_enabled, location, start_on_access); /* Check arguments */ if (H5P_DEFAULT == plist_id) @@ -4616,7 +4575,6 @@ H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled /*out*/, char *locati herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*b*s*z*b", plist_id, is_enabled, location, location_size, start_on_access); /* Get the property list structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -4874,7 +4832,6 @@ H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", fapl_id, evict_on_close); /* Compare the property list's class against the other class */ if (true != H5P_isa_class(fapl_id, H5P_FILE_ACCESS)) @@ -4914,7 +4871,6 @@ H5Pget_evict_on_close(hid_t fapl_id, hbool_t *evict_on_close /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", fapl_id, evict_on_close); /* Compare the property list's class against the other class */ if (true != H5P_isa_class(fapl_id, H5P_FILE_ACCESS)) @@ -4956,7 +4912,6 @@ H5Pset_file_locking(hid_t fapl_id, hbool_t use_file_locking, hbool_t ignore_when herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ibb", fapl_id, use_file_locking, ignore_when_disabled); /* Make sure this is a fapl */ if (true != H5P_isa_class(fapl_id, H5P_FILE_ACCESS)) @@ -4995,7 +4950,6 @@ H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking /*out*/, hbool_t *i herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*b*b", fapl_id, use_file_locking, ignore_when_disabled); /* Make sure this is a fapl */ if (H5P_DEFAULT == fapl_id) @@ -5108,7 +5062,6 @@ H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", plist_id, is_collective); /* Compare the property list's class against the other class */ /* (Dataset, group, attribute, and named datatype access property lists @@ -5155,7 +5108,6 @@ H5Pget_all_coll_metadata_ops(hid_t plist_id, hbool_t *is_collective /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", plist_id, is_collective); /* Compare the property list's class against the other class */ /* (Dataset, group, attribute, and named datatype access property lists @@ -5204,7 +5156,6 @@ H5Pset_coll_metadata_write(hid_t plist_id, hbool_t is_collective) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", plist_id, is_collective); /* Compare the property list's class against the other class */ if (true != H5P_isa_class(plist_id, H5P_FILE_ACCESS)) @@ -5238,7 +5189,6 @@ H5Pget_mpi_params(hid_t plist_id, MPI_Comm *comm /*out*/, MPI_Info *info /*out*/ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Mc*Mi", plist_id, comm, info); /* Make sure that the property list is a fapl */ if (true != H5P_isa_class(plist_id, H5P_FILE_ACCESS)) @@ -5274,7 +5224,6 @@ H5Pset_mpi_params(hid_t plist_id, MPI_Comm comm, MPI_Info info) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iMcMi", plist_id, comm, info); /* Make sure the MPI communicator is valid */ if (MPI_COMM_NULL == comm) @@ -5682,7 +5631,6 @@ H5Pget_coll_metadata_write(hid_t plist_id, hbool_t *is_collective /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", plist_id, is_collective); /* Compare the property list's class against the other class */ if (true != H5P_isa_class(plist_id, H5P_FILE_ACCESS)) @@ -5718,7 +5666,6 @@ H5Pset_page_buffer_size(hid_t plist_id, size_t buf_size, unsigned min_meta_perc, herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "izIuIu", plist_id, buf_size, min_meta_perc, min_raw_perc); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -5764,7 +5711,6 @@ H5Pget_page_buffer_size(hid_t plist_id, size_t *buf_size /*out*/, unsigned *min_ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*z*Iu*Iu", plist_id, buf_size, min_meta_perc, min_raw_perc); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) @@ -5877,7 +5823,6 @@ H5Pset_vol(hid_t plist_id, hid_t new_vol_id, const void *new_vol_info) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ii*x", plist_id, new_vol_id, new_vol_info); /* Check arguments */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -5911,7 +5856,6 @@ H5Pget_vol_id(hid_t plist_id, hid_t *vol_id /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*i", plist_id, vol_id); if (H5P_DEFAULT == plist_id) plist_id = H5P_FILE_ACCESS_DEFAULT; @@ -5960,7 +5904,6 @@ H5Pget_vol_info(hid_t plist_id, void **vol_info /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i**x", plist_id, vol_info); /* Get property list for ID */ if (NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) @@ -6028,7 +5971,6 @@ H5Pget_vol_cap_flags(hid_t plist_id, uint64_t *cap_flags) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*UL", plist_id, cap_flags); /* Get the 'cap_flags' from the connector */ if (cap_flags) { @@ -6295,7 +6237,6 @@ H5Pset_relax_file_integrity_checks(hid_t plist_id, uint64_t flags) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iUL", plist_id, flags); /* Check arguments */ if (H5P_DEFAULT == plist_id) @@ -6331,7 +6272,6 @@ H5Pget_relax_file_integrity_checks(hid_t plist_id, uint64_t *flags /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*UL", plist_id, flags); if (H5P_DEFAULT == plist_id) plist_id = H5P_FILE_ACCESS_DEFAULT; diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c index c622b26b600..446961889d2 100644 --- a/src/H5Pfcpl.c +++ b/src/H5Pfcpl.c @@ -317,7 +317,6 @@ H5Pset_userblock(hid_t plist_id, hsize_t size) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ih", plist_id, size); /* Sanity check non-zero userblock sizes */ if (size > 0) { @@ -361,7 +360,6 @@ H5Pget_userblock(hid_t plist_id, hsize_t *size /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", plist_id, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -394,7 +392,6 @@ H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "izz", plist_id, sizeof_addr, sizeof_size); /* Check arguments */ if (sizeof_addr) { @@ -447,7 +444,6 @@ H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr /*out*/, size_t *sizeof_size /* herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*z*z", plist_id, sizeof_addr, sizeof_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -503,7 +499,6 @@ H5Pset_sym_k(hid_t plist_id, unsigned ik, unsigned lk) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iIuIu", plist_id, ik, lk); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -548,7 +543,6 @@ H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out*/, unsigned *lk /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Iu*Iu", plist_id, ik, lk); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -587,7 +581,6 @@ H5Pset_istore_k(hid_t plist_id, unsigned ik) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, ik); /* Check arguments */ if (ik == 0) @@ -632,7 +625,6 @@ H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, ik); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -755,7 +747,6 @@ H5Pset_shared_mesg_nindexes(hid_t plist_id, unsigned nindexes) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, nindexes); /* Check argument */ if (nindexes > H5O_SHMESG_MAX_NINDEXES) @@ -790,7 +781,6 @@ H5Pget_shared_mesg_nindexes(hid_t plist_id, unsigned *nindexes /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, nindexes); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -827,7 +817,6 @@ H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iIuIuIu", plist_id, index_num, mesg_type_flags, min_mesg_size); /* Check arguments */ if (mesg_type_flags > H5O_SHMESG_ALL_FLAG) @@ -887,7 +876,6 @@ H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iIu*Iu*Iu", plist_id, index_num, mesg_type_flags, min_mesg_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -1110,7 +1098,6 @@ H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iIuIu", plist_id, max_list, min_btree); /* Check that values are sensible. The min_btree value must be no greater * than the max list plus one. @@ -1160,7 +1147,6 @@ H5Pget_shared_mesg_phase_change(hid_t plist_id, unsigned *max_list /*out*/, unsi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Iu*Iu", plist_id, max_list, min_btree); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -1197,7 +1183,6 @@ H5Pset_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t strategy, hbool herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iFfbh", plist_id, strategy, persist, threshold); /* Check arguments */ if (strategy >= H5F_FSPACE_STRATEGY_NTYPES) @@ -1242,7 +1227,6 @@ H5Pget_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t *strategy /*out herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*Ff*b*h", plist_id, strategy, persist, threshold); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -1345,7 +1329,6 @@ H5Pset_file_space_page_size(hid_t plist_id, hsize_t fsp_size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ih", plist_id, fsp_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) @@ -1382,7 +1365,6 @@ H5Pget_file_space_page_size(hid_t plist_id, hsize_t *fsp_size /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*h", plist_id, fsp_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_CREATE))) diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c index 4ea0448356c..321930980d3 100644 --- a/src/H5Pgcpl.c +++ b/src/H5Pgcpl.c @@ -149,7 +149,6 @@ H5Pset_local_heap_size_hint(hid_t plist_id, size_t size_hint) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iz", plist_id, size_hint); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_GROUP_CREATE))) @@ -186,7 +185,6 @@ H5Pget_local_heap_size_hint(hid_t plist_id, size_t *size_hint /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*z", plist_id, size_hint); if (size_hint) { H5P_genplist_t *plist; /* Property list pointer */ @@ -231,7 +229,6 @@ H5Pset_link_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dens herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense); /* Range check values */ if (max_compact < min_dense) @@ -281,7 +278,6 @@ H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact /*out*/, unsigned herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Iu*Iu", plist_id, max_compact, min_dense); /* Get values */ if (max_compact || min_dense) { @@ -331,7 +327,6 @@ H5Pset_est_link_info(hid_t plist_id, unsigned est_num_entries, unsigned est_name herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iIuIu", plist_id, est_num_entries, est_name_len); /* Range check values */ if (est_num_entries > 65535) @@ -379,7 +374,6 @@ H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries /*out*/, unsigned herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Iu*Iu", plist_id, est_num_entries, est_name_len); /* Get values */ if (est_num_entries || est_name_len) { @@ -421,7 +415,6 @@ H5Pset_link_creation_order(hid_t plist_id, unsigned crt_order_flags) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, crt_order_flags); /* Check for bad combination of flags */ if (!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED)) @@ -463,7 +456,6 @@ H5Pget_link_creation_order(hid_t plist_id, unsigned *crt_order_flags /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, crt_order_flags); /* Get values */ if (crt_order_flags) { diff --git a/src/H5Plapl.c b/src/H5Plapl.c index 6eb2b7326a3..3f06fb9755e 100644 --- a/src/H5Plapl.c +++ b/src/H5Plapl.c @@ -856,7 +856,6 @@ H5Pset_nlinks(hid_t plist_id, size_t nlinks) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iz", plist_id, nlinks); if (nlinks <= 0) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "number of links must be positive"); @@ -893,7 +892,6 @@ H5Pget_nlinks(hid_t plist_id, size_t *nlinks /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*z", plist_id, nlinks); if (!nlinks) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid pointer passed in"); @@ -928,7 +926,6 @@ H5Pset_elink_prefix(hid_t plist_id, const char *prefix) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", plist_id, prefix); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS))) @@ -964,7 +961,6 @@ H5Pget_elink_prefix(hid_t plist_id, char *prefix /*out*/, size_t size) ssize_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("Zs", "i*sz", plist_id, prefix, size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_ACCESS))) @@ -1010,7 +1006,6 @@ H5Pset_elink_fapl(hid_t lapl_id, hid_t fapl_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ii", lapl_id, fapl_id); /* Check arguments */ if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS))) @@ -1041,7 +1036,6 @@ H5Pget_elink_fapl(hid_t lapl_id) hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("i", "i", lapl_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS))) @@ -1072,7 +1066,6 @@ H5Pset_elink_acc_flags(hid_t lapl_id, unsigned flags) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", lapl_id, flags); /* Check that flags are valid */ if ((flags != H5F_ACC_RDWR) && (flags != (H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE)) && @@ -1109,7 +1102,6 @@ H5Pget_elink_acc_flags(hid_t lapl_id, unsigned *flags /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", lapl_id, flags); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS))) @@ -1143,7 +1135,6 @@ H5Pset_elink_cb(hid_t lapl_id, H5L_elink_traverse_t func, void *op_data) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iLt*x", lapl_id, func, op_data); /* Check if the callback function is NULL and the user data is non-NULL. * This is almost certainly an error as the user data will not be used. */ @@ -1184,7 +1175,6 @@ H5Pget_elink_cb(hid_t lapl_id, H5L_elink_traverse_t *func /*out*/, void **op_dat herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Lt**x", lapl_id, func, op_data); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(lapl_id, H5P_LINK_ACCESS))) diff --git a/src/H5Plcpl.c b/src/H5Plcpl.c index b720b105949..739ef76f3f2 100644 --- a/src/H5Plcpl.c +++ b/src/H5Plcpl.c @@ -139,7 +139,6 @@ H5Pset_create_intermediate_group(hid_t plist_id, unsigned crt_intmd_group) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, crt_intmd_group); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_CREATE))) @@ -171,7 +170,6 @@ H5Pget_create_intermediate_group(hid_t plist_id, unsigned *crt_intmd_group /*out herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, crt_intmd_group); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_LINK_CREATE))) diff --git a/src/H5Pmapl.c b/src/H5Pmapl.c index 8824f051f2c..45cbd7648aa 100644 --- a/src/H5Pmapl.c +++ b/src/H5Pmapl.c @@ -154,7 +154,6 @@ H5Pset_map_iterate_hints(hid_t mapl_id, size_t key_prefetch_size, size_t key_all herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "izz", mapl_id, key_prefetch_size, key_alloc_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(mapl_id, H5P_MAP_ACCESS))) @@ -186,7 +185,6 @@ H5Pget_map_iterate_hints(hid_t mapl_id, size_t *key_prefetch_size /*out*/, size_ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*z*z", mapl_id, key_prefetch_size, key_alloc_size); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(mapl_id, H5P_MAP_ACCESS))) diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index d293e84f08a..1e528844cc3 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -204,7 +204,6 @@ H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dens herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense); /* Range check values */ if (max_compact < min_dense) @@ -244,7 +243,6 @@ H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact /*out*/, unsigned herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Iu*Iu", plist_id, max_compact, min_dense); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE))) @@ -281,7 +279,6 @@ H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flags) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, crt_order_flags); /* Check for bad combination of flags */ if (!(crt_order_flags & H5P_CRT_ORDER_TRACKED) && (crt_order_flags & H5P_CRT_ORDER_INDEXED)) @@ -328,7 +325,6 @@ H5Pget_attr_creation_order(hid_t plist_id, unsigned *crt_order_flags /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, crt_order_flags); /* Get values */ if (crt_order_flags) { @@ -386,7 +382,6 @@ H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ib", plist_id, track_times); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE))) @@ -425,7 +420,6 @@ H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", plist_id, track_times); /* Get values */ if (track_times) { @@ -547,7 +541,6 @@ H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values); /* Check args */ if (filter < 0 || filter > H5Z_FILTER_MAX) @@ -606,7 +599,6 @@ H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values); /* Check args */ if (filter < 0 || filter > H5Z_FILTER_MAX) @@ -715,7 +707,6 @@ H5Pget_nfilters(hid_t plist_id) int ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("Is", "i", plist_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE))) @@ -764,8 +755,6 @@ H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/, size_t H5Z_filter_t ret_value; /* return value */ FUNC_ENTER_API(H5Z_FILTER_ERROR) - H5TRACE8("Zf", "iIu*Iu*z*Iuz*s*Iu", plist_id, idx, flags, cd_nelmts, cd_values, namelen, name, - filter_config); /* Check args */ if (cd_nelmts || cd_values) { @@ -889,8 +878,6 @@ H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out* herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE8("e", "iZf*Iu*z*Iuz*s*Iu", plist_id, id, flags, cd_nelmts, cd_values, namelen, name, - filter_config); /* Check args */ if (id < 0 || id > H5Z_FILTER_MAX) @@ -947,7 +934,6 @@ H5Pall_filters_avail(hid_t plist_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "i", plist_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE))) @@ -1015,7 +1001,6 @@ H5Premove_filter(hid_t plist_id, H5Z_filter_t filter) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iZf", plist_id, filter); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE))) @@ -1063,7 +1048,6 @@ H5Pset_deflate(hid_t plist_id, unsigned level) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, level); /* Check arguments */ if (level > 9) @@ -1107,7 +1091,6 @@ H5Pset_fletcher32(hid_t plist_id) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", plist_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_CREATE))) @@ -1665,7 +1648,6 @@ H5Pget_filter1(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/, size_t H5Z_filter_t ret_value; /* return value */ FUNC_ENTER_API(H5Z_FILTER_ERROR) - H5TRACE7("Zf", "iIu*Iu*z*Iuz*s", plist_id, idx, flags, cd_nelmts, cd_values, namelen, name); /* Check args */ if (cd_nelmts || cd_values) { @@ -1742,7 +1724,6 @@ H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsigned int *flags /*out* herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "iZf*Iu*z*Iuz*s", plist_id, id, flags, cd_nelmts, cd_values, namelen, name); /* Check args */ if (id < 0 || id > H5Z_FILTER_MAX) diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c index 8a723378574..829371efcec 100644 --- a/src/H5Pocpypl.c +++ b/src/H5Pocpypl.c @@ -610,7 +610,6 @@ H5Pset_copy_object(hid_t plist_id, unsigned cpy_option) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iIu", plist_id, cpy_option); /* Check parameters */ if (cpy_option & ~H5O_COPY_ALL) @@ -645,7 +644,6 @@ H5Pget_copy_object(hid_t plist_id, unsigned *cpy_option /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Iu", plist_id, cpy_option); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY))) @@ -687,7 +685,6 @@ H5Padd_merge_committed_dtype_path(hid_t plist_id, const char *path) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", plist_id, path); /* Check parameters */ if (!path) @@ -746,7 +743,6 @@ H5Pfree_merge_committed_dtype_paths(hid_t plist_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", plist_id); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY))) @@ -792,7 +788,6 @@ H5Pset_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t func, void *op_data) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iOs*x", plist_id, func, op_data); /* Check if the callback function is NULL and the user data is non-NULL. * This is almost certainly an error as the user data will not be used. */ @@ -838,7 +833,6 @@ H5Pget_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t *func /*out*/, void * herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Os**x", plist_id, func, op_data); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_OBJECT_COPY))) diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c index 58cfa4c6645..3facfff7d12 100644 --- a/src/H5Pstrcpl.c +++ b/src/H5Pstrcpl.c @@ -140,7 +140,6 @@ H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iTc", plist_id, encoding); /* Check arguments */ if (encoding <= H5T_CSET_ERROR || encoding >= H5T_NCSET) @@ -174,7 +173,6 @@ H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Tc", plist_id, encoding); /* Get the plist structure */ if (NULL == (plist = H5P_object_verify(plist_id, H5P_STRING_CREATE))) diff --git a/src/H5R.c b/src/H5R.c index 3a91b926a17..1ab3711baaa 100644 --- a/src/H5R.c +++ b/src/H5R.c @@ -89,7 +89,6 @@ H5Rcreate_object(hid_t loc_id, const char *name, hid_t oapl_id, H5R_ref_t *ref_p herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*si*Rr", loc_id, name, oapl_id, ref_ptr); /* Check args */ if (ref_ptr == NULL) @@ -186,7 +185,6 @@ H5Rcreate_region(hid_t loc_id, const char *name, hid_t space_id, hid_t oapl_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*sii*Rr", loc_id, name, space_id, oapl_id, ref_ptr); /* Check args */ if (ref_ptr == NULL) @@ -286,7 +284,6 @@ H5Rcreate_attr(hid_t loc_id, const char *name, const char *attr_name, hid_t oapl herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*s*si*Rr", loc_id, name, attr_name, oapl_id, ref_ptr); /* Check args */ if (ref_ptr == NULL) @@ -375,7 +372,6 @@ H5Rdestroy(H5R_ref_t *ref_ptr) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*Rr", ref_ptr); /* Check args */ if (NULL == ref_ptr) @@ -408,7 +404,6 @@ H5Rget_type(const H5R_ref_t *ref_ptr) H5R_type_t ret_value; /* Return value */ FUNC_ENTER_API(H5R_BADTYPE) - H5TRACE1("Rt", "*Rr", ref_ptr); /* Check args */ if (NULL == ref_ptr) @@ -438,7 +433,6 @@ H5Requal(const H5R_ref_t *ref1_ptr, const H5R_ref_t *ref2_ptr) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "*Rr*Rr", ref1_ptr, ref2_ptr); /* Check args */ if (!ref1_ptr || !ref2_ptr) @@ -467,7 +461,6 @@ H5Rcopy(const H5R_ref_t *src_ref_ptr, H5R_ref_t *dst_ref_ptr) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "*Rr*Rr", src_ref_ptr, dst_ref_ptr); /* Check args */ if (NULL == src_ref_ptr || NULL == dst_ref_ptr) @@ -565,7 +558,6 @@ H5Ropen_object(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "*Rrii", ref_ptr, rapl_id, oapl_id); /* Open the dataset synchronously */ if ((ret_value = H5R__open_object_api_common(ref_ptr, rapl_id, oapl_id, NULL, NULL)) < 0) @@ -594,7 +586,6 @@ H5Ropen_object_async(const char *app_file, const char *app_func, unsigned app_li hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIu*Rriii", app_file, app_func, app_line, ref_ptr, rapl_id, oapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -733,7 +724,6 @@ H5Ropen_region(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t oapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "*Rrii", ref_ptr, rapl_id, oapl_id); /* Open the region synchronously */ if ((ret_value = H5R__open_region_api_common(ref_ptr, rapl_id, oapl_id, NULL, NULL)) < 0) @@ -762,7 +752,6 @@ H5Ropen_region_async(const char *app_file, const char *app_func, unsigned app_li hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIu*Rriii", app_file, app_func, app_line, ref_ptr, rapl_id, oapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -903,7 +892,6 @@ H5Ropen_attr(H5R_ref_t *ref_ptr, hid_t rapl_id, hid_t aapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "*Rrii", ref_ptr, rapl_id, aapl_id); /* Open the attribute synchronously */ if ((ret_value = H5R__open_attr_api_common(ref_ptr, rapl_id, aapl_id, NULL, NULL)) < 0) @@ -932,7 +920,6 @@ H5Ropen_attr_async(const char *app_file, const char *app_func, unsigned app_line hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIu*Rriii", app_file, app_func, app_line, ref_ptr, rapl_id, aapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -979,7 +966,6 @@ H5Rget_obj_type3(H5R_ref_t *ref_ptr, hid_t rapl_id, H5O_type_t *obj_type /*out*/ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*Rri*Ot", ref_ptr, rapl_id, obj_type); /* Check args */ if (ref_ptr == NULL) @@ -1038,7 +1024,6 @@ H5Rget_file_name(const H5R_ref_t *ref_ptr, char *buf /*out*/, size_t size) ssize_t ret_value; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "*Rr*sz", ref_ptr, buf, size); /* Check args */ if (ref_ptr == NULL) @@ -1104,7 +1089,6 @@ H5Rget_obj_name(H5R_ref_t *ref_ptr, hid_t rapl_id, char *buf /*out*/, size_t siz ssize_t ret_value = 0; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE4("Zs", "*Rri*sz", ref_ptr, rapl_id, buf, size); /* Check args */ if (ref_ptr == NULL) @@ -1166,7 +1150,6 @@ H5Rget_attr_name(const H5R_ref_t *ref_ptr, char *buf /*out*/, size_t size) ssize_t ret_value; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE3("Zs", "*Rr*sz", ref_ptr, buf, size); /* Check args */ if (ref_ptr == NULL) diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index 90869cf3ab1..988f3292722 100644 --- a/src/H5Rdeprec.c +++ b/src/H5Rdeprec.c @@ -254,7 +254,6 @@ H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *ref) H5G_obj_t ret_value; /* Return value */ FUNC_ENTER_API(H5G_UNKNOWN) - H5TRACE3("Go", "iRt*x", id, ref_type, ref); /* Check args */ if (buf == NULL) @@ -329,7 +328,6 @@ H5Rdereference1(hid_t obj_id, H5R_type_t ref_type, const void *ref) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "iRt*x", obj_id, ref_type, ref); /* Check args */ if (buf == NULL) @@ -408,7 +406,6 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*xi*sRti", ref, loc_id, name, ref_type, space_id); /* Check args */ if (buf == NULL) @@ -527,7 +524,6 @@ H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *ref, H5O_type_t *obj herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iRt*x*Ot", id, ref_type, ref, obj_type); /* Check args */ if (buf == NULL) @@ -599,7 +595,6 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *re hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE4("i", "iiRt*x", obj_id, oapl_id, ref_type, ref); /* Check args */ if (oapl_id < 0) @@ -682,7 +677,6 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "iRt*x", id, ref_type, ref); /* Check args */ if (buf == NULL) @@ -765,7 +759,6 @@ H5Rget_name(hid_t id, H5R_type_t ref_type, const void *ref, char *name /*out*/, ssize_t ret_value = -1; /* Return value */ FUNC_ENTER_API((-1)) - H5TRACE5("Zs", "iRt*x*sz", id, ref_type, ref, name, size); /* Check args */ if (buf == NULL) diff --git a/src/H5S.c b/src/H5S.c index 65d7c49b6ad..3b8a825ee8c 100644 --- a/src/H5S.c +++ b/src/H5S.c @@ -329,7 +329,6 @@ H5Screate(H5S_class_t type) hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("i", "Sc", type); /* Check args */ if (type <= H5S_NO_CLASS || type > H5S_NULL) /* don't allow complex dataspace yet */ @@ -432,7 +431,6 @@ H5Sclose(hid_t space_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", space_id); /* Check args */ if (NULL == H5I_object_verify(space_id, H5I_DATASPACE)) @@ -465,7 +463,6 @@ H5Scopy(hid_t space_id) hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", space_id); /* Check args */ if (NULL == (src = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -504,7 +501,6 @@ H5Sextent_copy(hid_t dst_id, hid_t src_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ii", dst_id, src_id); /* Check args */ if (NULL == (src = (H5S_t *)H5I_object_verify(src_id, H5I_DATASPACE))) @@ -716,7 +712,6 @@ H5Sget_simple_extent_npoints(hid_t space_id) hssize_t ret_value; FUNC_ENTER_API(FAIL) - H5TRACE1("Hs", "i", space_id); /* Check args */ if (NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -806,7 +801,6 @@ H5Sget_simple_extent_ndims(hid_t space_id) int ret_value = -1; FUNC_ENTER_API((-1)) - H5TRACE1("Is", "i", space_id); /* Check args */ if (NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -881,7 +875,6 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[] /*out*/, hsize_t maxdim int ret_value = -1; FUNC_ENTER_API((-1)) - H5TRACE3("Is", "i*h*h", space_id, dims, maxdims); /* Check args */ if (NULL == (ds = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -1128,7 +1121,6 @@ H5Sis_simple(hid_t space_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "i", space_id); /* Check args and all the boring stuff. */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -1174,7 +1166,6 @@ H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/], con herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iIs*[a1]h*[a1]h", space_id, rank, dims, max); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -1302,7 +1293,6 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/], const hsize_t maxdims[/ hid_t ret_value = H5I_INVALID_HID; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "Is*[a0]h*[a0]h", rank, dims, maxdims); /* Check arguments */ if (rank < 0) @@ -1391,7 +1381,6 @@ H5Sencode2(hid_t obj_id, void *buf, size_t *nalloc, hid_t fapl_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*x*zi", obj_id, buf, nalloc, fapl_id); /* Check argument and retrieve object */ if (NULL == (dspace = (H5S_t *)H5I_object_verify(obj_id, H5I_DATASPACE))) @@ -1500,7 +1489,6 @@ H5Sdecode(const void *buf) hid_t ret_value; FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "*x", buf); if (buf == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5I_INVALID_HID, "empty buffer"); @@ -1667,7 +1655,6 @@ H5Sget_simple_extent_type(hid_t sid) H5S_class_t ret_value; /* Return value */ FUNC_ENTER_API(H5S_NO_CLASS) - H5TRACE1("Sc", "i", sid); /* Check arguments */ if (NULL == (space = (H5S_t *)H5I_object_verify(sid, H5I_DATASPACE))) @@ -1700,7 +1687,6 @@ H5Sset_extent_none(hid_t space_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", space_id); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -1849,7 +1835,6 @@ H5Sextent_equal(hid_t space1_id, hid_t space2_id) htri_t ret_value; FUNC_ENTER_API(FAIL) - H5TRACE2("t", "ii", space1_id, space2_id); /* check args */ if (NULL == (ds1 = (const H5S_t *)H5I_object_verify(space1_id, H5I_DATASPACE)) || diff --git a/src/H5Sall.c b/src/H5Sall.c index 0450ee75141..1a9d8fc4029 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -1155,7 +1155,6 @@ H5Sselect_all(hid_t spaceid) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", spaceid); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) diff --git a/src/H5Sdeprec.c b/src/H5Sdeprec.c index fc850874a79..062bf29fec0 100644 --- a/src/H5Sdeprec.c +++ b/src/H5Sdeprec.c @@ -86,7 +86,6 @@ H5Sencode1(hid_t obj_id, void *buf, size_t *nalloc) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*x*z", obj_id, buf, nalloc); /* Check argument and retrieve object */ if (NULL == (dspace = (H5S_t *)H5I_object_verify(obj_id, H5I_DATASPACE))) diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 6b07529df96..3737689fa6b 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -3482,7 +3482,6 @@ H5Sget_select_hyper_nblocks(hid_t spaceid) hssize_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("Hs", "i", spaceid); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -4821,7 +4820,6 @@ H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numbloc herr_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "ihh*[a2]h", spaceid, startblock, numblocks, buf); /* Check args */ if (buf == NULL) @@ -10300,7 +10298,6 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], con herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -10625,7 +10622,6 @@ H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[], co hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE6("i", "iSs*h*h*h*h", space_id, op, start, stride, count, block); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -10745,7 +10741,6 @@ H5Scombine_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "iSsi", space1_id, op, space2_id); /* Check args */ if (NULL == (space1 = (H5S_t *)H5I_object_verify(space1_id, H5I_DATASPACE))) @@ -10875,7 +10870,6 @@ H5Smodify_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iSsi", space1_id, op, space2_id); /* Check args */ if (NULL == (space1 = (H5S_t *)H5I_object_verify(space1_id, H5I_DATASPACE))) @@ -12382,7 +12376,6 @@ H5Sis_regular_hyperslab(hid_t spaceid) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "i", spaceid); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -12431,7 +12424,6 @@ H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[] /*out*/, hsize_t stride[ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "i*h*h*h*h", spaceid, start, stride, count, block); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) diff --git a/src/H5Snone.c b/src/H5Snone.c index 9e1ac8a8bef..397fb5860e1 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -1056,7 +1056,6 @@ H5Sselect_none(hid_t spaceid) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", spaceid); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 690cb6592ac..142332d6252 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -1003,7 +1003,6 @@ H5Sget_select_elem_npoints(hid_t spaceid) hssize_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("Hs", "i", spaceid); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -1645,7 +1644,6 @@ H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoint herr_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "ihh*[a2]h", spaceid, startpoint, numpoints, buf); /* Check args */ if (NULL == buf) @@ -2454,7 +2452,6 @@ H5Sselect_elements(hid_t spaceid, H5S_seloper_t op, size_t num_elem, const hsize herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iSsz*h", spaceid, op, num_elem, coord); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) diff --git a/src/H5Sselect.c b/src/H5Sselect.c index ef9994ec1b2..fb2927f3c3b 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -128,7 +128,6 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Hs", space_id, offset); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -176,7 +175,6 @@ H5Sselect_copy(hid_t dst_id, hid_t src_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ii", dst_id, src_id); /* Check args */ if (NULL == (src = (H5S_t *)H5I_object_verify(src_id, H5I_DATASPACE))) @@ -366,7 +364,6 @@ H5Sget_select_npoints(hid_t spaceid) hssize_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("Hs", "i", spaceid); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -436,7 +433,6 @@ H5Sselect_valid(hid_t spaceid) htri_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "i", spaceid); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) @@ -595,7 +591,6 @@ H5Sget_select_bounds(hid_t spaceid, hsize_t start[] /*out*/, hsize_t end[] /*out herr_t ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*h*h", spaceid, start, end); /* Check args */ if (start == NULL || end == NULL) @@ -986,7 +981,6 @@ H5Sselect_adjust(hid_t space_id, const hssize_t *offset) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*Hs", space_id, offset); if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "not a dataspace"); @@ -1525,7 +1519,6 @@ H5Sget_select_type(hid_t space_id) H5S_sel_type ret_value; /* Return value */ FUNC_ENTER_API(H5S_SEL_ERROR) - H5TRACE1("St", "i", space_id); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -1883,7 +1876,6 @@ H5Sselect_shape_same(hid_t space1_id, hid_t space2_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "ii", space1_id, space2_id); if (NULL == (space1 = (H5S_t *)H5I_object_verify(space1_id, H5I_DATASPACE))) HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "not a dataspace"); @@ -1987,7 +1979,6 @@ H5Sselect_intersect_block(hid_t space_id, const hsize_t *start, const hsize_t *e htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("t", "i*h*h", space_id, start, end); /* Check arguments */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -2665,7 +2656,6 @@ H5Sselect_project_intersection(hid_t src_space_id, hid_t dst_space_id, hid_t src hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("i", "iii", src_space_id, dst_space_id, src_intersect_space_id); /* Check args */ if (NULL == (src_space = (H5S_t *)H5I_object_verify(src_space_id, H5I_DATASPACE))) @@ -2817,7 +2807,6 @@ H5Ssel_iter_create(hid_t space_id, size_t elmt_size, unsigned flags) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "izIu", space_id, elmt_size, flags); /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) @@ -2900,7 +2889,6 @@ H5Ssel_iter_get_seq_list(hid_t sel_iter_id, size_t maxseq, size_t maxelmts, size herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "izz*z*z*h*z", sel_iter_id, maxseq, maxelmts, nseq, nelmts, off, len); /* Check args */ if (NULL == (sel_iter = (H5S_sel_iter_t *)H5I_object_verify(sel_iter_id, H5I_SPACE_SEL_ITER))) @@ -3032,7 +3020,6 @@ H5Ssel_iter_reset(hid_t sel_iter_id, hid_t space_id) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "ii", sel_iter_id, space_id); /* Check args */ if (NULL == (sel_iter = (H5S_sel_iter_t *)H5I_object_verify(sel_iter_id, H5I_SPACE_SEL_ITER))) @@ -3136,7 +3123,6 @@ H5Ssel_iter_close(hid_t sel_iter_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", sel_iter_id); /* Check args */ if (NULL == H5I_object_verify(sel_iter_id, H5I_SPACE_SEL_ITER)) diff --git a/src/H5T.c b/src/H5T.c index 9edd9b98d3a..cec26a80e0c 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -1911,7 +1911,6 @@ H5Tcreate(H5T_class_t type, size_t size) hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("i", "Ttz", type, size); /* check args. We support string (fixed-size or variable-length) now. */ if (size <= 0 && size != H5T_VARIABLE) @@ -1956,7 +1955,6 @@ H5Tcopy(hid_t obj_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", obj_id); switch (H5I_get_type(obj_id)) { case H5I_DATATYPE: @@ -2051,7 +2049,6 @@ H5Tclose(hid_t type_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -2087,7 +2084,6 @@ H5Tclose_async(const char *app_file, const char *app_func, unsigned app_line, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "*s*sIuii", app_file, app_func, app_line, type_id, es_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -2146,7 +2142,6 @@ H5Tequal(hid_t type1_id, hid_t type2_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "ii", type1_id, type2_id); /* check args */ if (NULL == (dt1 = (H5T_t *)H5I_object_verify(type1_id, H5I_DATATYPE))) @@ -2182,7 +2177,6 @@ H5Tlock(hid_t type_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -2215,7 +2209,6 @@ H5Tget_class(hid_t type_id) H5T_class_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_NO_CLASS) - H5TRACE1("Tt", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -2279,7 +2272,6 @@ H5Tdetect_class(hid_t type, H5T_class_t cls) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "iTt", type, cls); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE))) @@ -2384,7 +2376,6 @@ H5Tis_variable_str(hid_t dtype_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "i", dtype_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE))) @@ -2435,7 +2426,6 @@ H5Tget_size(hid_t type_id) size_t ret_value; /* Return value */ FUNC_ENTER_API(0) - H5TRACE1("z", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -2476,7 +2466,6 @@ H5Tset_size(hid_t type_id, size_t size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iz", type_id, size); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -2520,7 +2509,6 @@ H5Tget_super(hid_t type) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", type); if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "not a datatype"); @@ -2838,7 +2826,6 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_c herr_t ret_value = SUCCEED; /*return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "Te*siiTC", pers, name, src_id, dst_id, func); /* Check args */ if (H5T_PERS_HARD != pers && H5T_PERS_SOFT != pers) @@ -2978,7 +2965,6 @@ H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE5("e", "Te*siiTC", pers, name, src_id, dst_id, func); /* Check arguments */ if (src_id > 0 && (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)))) @@ -3016,7 +3002,6 @@ H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata /*out*/) H5T_conv_t ret_value; /* Return value */ FUNC_ENTER_API(NULL) - H5TRACE3("TC", "ii**!", src_id, dst_id, pcdata); /* Check args */ if (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) || @@ -3060,7 +3045,6 @@ H5Tcompiler_conv(hid_t src_id, hid_t dst_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("t", "ii", src_id, dst_id); /* Check args */ if (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) || @@ -3103,7 +3087,6 @@ H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *backgroun herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "iiz*x*xi", src_id, dst_id, nelmts, buf, background, dxpl_id); /* Check args */ if (NULL == (src = (H5T_t *)H5I_object_verify(src_id, H5I_DATATYPE)) || @@ -3148,7 +3131,6 @@ H5Treclaim(hid_t type_id, hid_t space_id, hid_t dxpl_id, void *buf) herr_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iii*x", type_id, space_id, dxpl_id, buf); /* Check args */ if (buf == NULL) @@ -3195,7 +3177,6 @@ H5Tencode(hid_t obj_id, void *buf, size_t *nalloc) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*x*z", obj_id, buf, nalloc); /* Check argument and retrieve object */ if (NULL == (dtype = (H5T_t *)H5I_object_verify(obj_id, H5I_DATATYPE))) @@ -3230,7 +3211,6 @@ H5Tdecode(const void *buf) hid_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("i", "*x", buf); /* Check args */ if (buf == NULL) diff --git a/src/H5TS.c b/src/H5TS.c index 8aadd904c34..30862401f6c 100644 --- a/src/H5TS.c +++ b/src/H5TS.c @@ -414,10 +414,12 @@ H5TS__mutex_acquire(H5TS_mutex_t *mutex, unsigned int lock_count, bool *acquired *-------------------------------------------------------------------------- */ herr_t -H5TSmutex_acquire(unsigned int lock_count, bool *acquired){ +H5TSmutex_acquire(unsigned int lock_count, bool *acquired) +{ FUNC_ENTER_API_NAMECHECK_ONLY - FUNC_LEAVE_API_NAMECHECK_ONLY(H5TS__mutex_acquire(&H5_g.init_lock, lock_count, acquired))} + FUNC_LEAVE_API_NAMECHECK_ONLY(H5TS__mutex_acquire(&H5_g.init_lock, lock_count, acquired)) +} /* end H5TSmutex_acquire() */ /*-------------------------------------------------------------------------- @@ -440,7 +442,8 @@ H5TSmutex_acquire(unsigned int lock_count, bool *acquired){ * *-------------------------------------------------------------------------- */ -herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex) +herr_t +H5TS_mutex_lock(H5TS_mutex_t *mutex) { herr_t ret_value = SUCCEED; diff --git a/src/H5Tarray.c b/src/H5Tarray.c index fefc57472d9..620b4834e60 100644 --- a/src/H5Tarray.c +++ b/src/H5Tarray.c @@ -86,7 +86,6 @@ H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/* ndims */]) hid_t ret_value; /* return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "iIu*h", base_id, ndims, dim); /* Check args */ if (ndims < 1 || ndims > H5S_MAX_RANK) @@ -190,7 +189,6 @@ H5Tget_array_ndims(hid_t type_id) int ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("Is", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -245,7 +243,6 @@ H5Tget_array_dims2(hid_t type_id, hsize_t dims[] /*out*/) int ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("Is", "i*h", type_id, dims); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -318,7 +315,6 @@ H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */], hid_t ret_value; /* return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE4("i", "iIs*h*Is", base_id, ndims, dim, perm); /* Check args */ if (ndims < 1 || ndims > H5S_MAX_RANK) @@ -364,7 +360,6 @@ H5Tget_array_dims1(hid_t type_id, hsize_t dims[] /*out*/, int H5_ATTR_UNUSED per int ret_value; /* return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("Is", "i*h*Is", type_id, dims, perm); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index 00a88984375..eed0e3b1dc4 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -167,7 +167,6 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, hid_t t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*siiii", loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id); /* Commit the dataset synchronously */ if ((ret_value = H5T__commit_api_common(loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id, NULL, NULL)) < @@ -197,8 +196,6 @@ H5Tcommit_async(const char *app_file, const char *app_func, unsigned app_line, h herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE10("e", "*s*sIui*siiiii", app_file, app_func, app_line, loc_id, name, type_id, lcpl_id, tcpl_id, - tapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -324,7 +321,6 @@ H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iiii", loc_id, type_id, tcpl_id, tapl_id); /* Check arguments */ if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -579,7 +575,6 @@ H5Tcommitted(hid_t type_id) htri_t ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "i", type_id); /* Check arguments */ if (NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -691,7 +686,6 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE3("i", "i*si", loc_id, name, tapl_id); /* Open the datatype synchronously */ if ((ret_value = H5T__open_api_common(loc_id, name, tapl_id, NULL, NULL)) < 0) @@ -722,7 +716,6 @@ H5Topen_async(const char *app_file, const char *app_func, unsigned app_line, hid hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE7("i", "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, tapl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -773,7 +766,6 @@ H5Tget_create_plist(hid_t dtype_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", dtype_id); /* Check arguments */ if (NULL == (type = (H5T_t *)H5I_object_verify(dtype_id, H5I_DATATYPE))) @@ -833,7 +825,6 @@ H5Tflush(hid_t type_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -877,7 +868,6 @@ H5Trefresh(hid_t type_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c index 17ccc50ac7e..eb39dd4e98a 100644 --- a/src/H5Tcompound.c +++ b/src/H5Tcompound.c @@ -87,7 +87,6 @@ H5Tget_member_offset(hid_t type_id, unsigned membno) size_t ret_value; /* Return value */ FUNC_ENTER_API(0) - H5TRACE2("z", "iIu", type_id, membno); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type) @@ -147,7 +146,6 @@ H5Tget_member_class(hid_t type_id, unsigned membno) H5T_class_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_NO_CLASS) - H5TRACE2("Tt", "iIu", type_id, membno); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type) @@ -187,7 +185,6 @@ H5Tget_member_type(hid_t type_id, unsigned membno) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "iIu", type_id, membno); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || H5T_COMPOUND != dt->shared->type) @@ -324,7 +321,6 @@ H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*szi", parent_id, name, offset, member_id); /* Check args */ if (parent_id == member_id) @@ -364,7 +360,6 @@ H5Tpack(hid_t type_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)) || diff --git a/src/H5Tcset.c b/src/H5Tcset.c index 60eea699e61..28cfe63f9a6 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -42,7 +42,6 @@ H5Tget_cset(hid_t type_id) H5T_cset_t ret_value; FUNC_ENTER_API(H5T_CSET_ERROR) - H5TRACE1("Tc", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -81,7 +80,6 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iTc", type_id, cset); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c index d9f293071d9..cc998346cb4 100644 --- a/src/H5Tdeprec.c +++ b/src/H5Tdeprec.c @@ -99,7 +99,6 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*si", loc_id, name, type_id); /* Check arguments */ if (!name || !*name) @@ -159,7 +158,6 @@ H5Topen1(hid_t loc_id, const char *name) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "i*s", loc_id, name); /* Check args */ if (!name || !*name) diff --git a/src/H5Tenum.c b/src/H5Tenum.c index 15a5522173b..53a6ab36e46 100644 --- a/src/H5Tenum.c +++ b/src/H5Tenum.c @@ -47,7 +47,6 @@ H5Tenum_create(hid_t parent_id) hid_t ret_value; /*return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", parent_id); /* Check args */ if (NULL == (parent = (H5T_t *)H5I_object_verify(parent_id, H5I_DATATYPE)) || @@ -124,7 +123,6 @@ H5Tenum_insert(hid_t type, const char *name, const void *value) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*x", type, name, value); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE))) @@ -223,7 +221,6 @@ H5Tget_member_value(hid_t type, unsigned membno, void *value /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iIu*x", type, membno, value); if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type"); @@ -290,7 +287,6 @@ H5Tenum_nameof(hid_t type, const void *value, char *name /*out*/, size_t size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "i*x*sz", type, value, name, size); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE))) @@ -421,7 +417,6 @@ H5Tenum_valueof(hid_t type, const char *name, void *value /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*s*x", type, name, value); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE))) diff --git a/src/H5Tfields.c b/src/H5Tfields.c index 55289f6793b..86c9e1eb51b 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -44,7 +44,6 @@ H5Tget_nmembers(hid_t type_id) int ret_value; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("Is", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -114,7 +113,6 @@ H5Tget_member_name(hid_t type_id, unsigned membno) char *ret_value; FUNC_ENTER_API(NULL) - H5TRACE2("*s", "iIu", type_id, membno); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -204,7 +202,6 @@ H5Tget_member_index(hid_t type_id, const char *name) unsigned i; FUNC_ENTER_API(FAIL) - H5TRACE2("Is", "i*s", type_id, name); /* Check arguments */ assert(name); diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c index 12f600b92fe..178a0271fb4 100644 --- a/src/H5Tfixed.c +++ b/src/H5Tfixed.c @@ -40,7 +40,6 @@ H5Tget_sign(hid_t type_id) H5T_sign_t ret_value; FUNC_ENTER_API(H5T_SGN_ERROR) - H5TRACE1("Ts", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -104,7 +103,6 @@ H5Tset_sign(hid_t type_id, H5T_sign_t sign) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iTs", type_id, sign); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c index c580e227b6a..0eefd730b73 100644 --- a/src/H5Tfloat.c +++ b/src/H5Tfloat.c @@ -47,7 +47,6 @@ H5Tget_fields(hid_t type_id, size_t *spos /*out*/, size_t *epos /*out*/, size_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "i*z*z*z*z*z", type_id, spos, epos, esize, mpos, msize); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -95,7 +94,6 @@ H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize, size_t mpos herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE6("e", "izzzzz", type_id, spos, epos, esize, mpos, msize); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -150,7 +148,6 @@ H5Tget_ebias(hid_t type_id) size_t ret_value; /* Return value */ FUNC_ENTER_API(0) - H5TRACE1("z", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -183,7 +180,6 @@ H5Tset_ebias(hid_t type_id, size_t ebias) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iz", type_id, ebias); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -221,7 +217,6 @@ H5Tget_norm(hid_t type_id) H5T_norm_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_NORM_ERROR) - H5TRACE1("Tn", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -255,7 +250,6 @@ H5Tset_norm(hid_t type_id, H5T_norm_t norm) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iTn", type_id, norm); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -297,7 +291,6 @@ H5Tget_inpad(hid_t type_id) H5T_pad_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_PAD_ERROR) - H5TRACE1("Tp", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -333,7 +326,6 @@ H5Tset_inpad(hid_t type_id, H5T_pad_t pad) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iTp", type_id, pad); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tnative.c b/src/H5Tnative.c index 46ffe772b92..01ba1a48386 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -72,7 +72,6 @@ H5Tget_native_type(hid_t type_id, H5T_direction_t direction) hid_t ret_value; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "iTd", type_id, direction); /* Check arguments */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Toffset.c b/src/H5Toffset.c index 278e32bf353..332bc41ade1 100644 --- a/src/H5Toffset.c +++ b/src/H5Toffset.c @@ -58,7 +58,6 @@ H5Tget_offset(hid_t type_id) int ret_value; FUNC_ENTER_API(-1) - H5TRACE1("Is", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -157,7 +156,6 @@ H5Tset_offset(hid_t type_id, size_t offset) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iz", type_id, offset); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Topaque.c b/src/H5Topaque.c index 63282ec06e9..edaeb69e3d6 100644 --- a/src/H5Topaque.c +++ b/src/H5Topaque.c @@ -39,7 +39,6 @@ H5Tset_tag(hid_t type_id, const char *tag) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*s", type_id, tag); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -80,7 +79,6 @@ H5Tget_tag(hid_t type_id) char *ret_value; FUNC_ENTER_API(NULL) - H5TRACE1("*s", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Torder.c b/src/H5Torder.c index ccdf4bfc10b..e358c74168c 100644 --- a/src/H5Torder.c +++ b/src/H5Torder.c @@ -81,7 +81,6 @@ H5Tget_order(hid_t type_id) H5T_order_t ret_value; /* Return value */ FUNC_ENTER_API(H5T_ORDER_ERROR) - H5TRACE1("To", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -181,7 +180,6 @@ H5Tset_order(hid_t type_id, H5T_order_t order) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iTo", type_id, order); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tpad.c b/src/H5Tpad.c index 6e164f883cf..4074f12058f 100644 --- a/src/H5Tpad.c +++ b/src/H5Tpad.c @@ -40,7 +40,6 @@ H5Tget_pad(hid_t type_id, H5T_pad_t *lsb /*out*/, H5T_pad_t *msb /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "i*Tp*Tp", type_id, lsb, msb); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -76,7 +75,6 @@ H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "iTpTp", type_id, lsb, msb); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c index 4feca691164..986d2646323 100644 --- a/src/H5Tprecis.c +++ b/src/H5Tprecis.c @@ -47,7 +47,6 @@ H5Tget_precision(hid_t type_id) size_t ret_value; FUNC_ENTER_API(0) - H5TRACE1("z", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -124,7 +123,6 @@ H5Tset_precision(hid_t type_id, size_t prec) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iz", type_id, prec); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c index 89034cc6db1..2fec03c62e3 100644 --- a/src/H5Tstrpad.c +++ b/src/H5Tstrpad.c @@ -43,7 +43,6 @@ H5Tget_strpad(hid_t type_id) H5T_str_t ret_value; FUNC_ENTER_API(H5T_STR_ERROR) - H5TRACE1("Tz", "i", type_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -92,7 +91,6 @@ H5Tset_strpad(hid_t type_id, H5T_str_t strpad) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "iTz", type_id, strpad); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index 971dc3c5d22..d8832714917 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -144,7 +144,6 @@ H5Tvlen_create(hid_t base_id) hid_t ret_value; /*return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("i", "i", base_id); /* Check args */ if (NULL == (base = (H5T_t *)H5I_object_verify(base_id, H5I_DATATYPE))) diff --git a/src/H5VL.c b/src/H5VL.c index ce28a24cff1..9eb4ab36daf 100644 --- a/src/H5VL.c +++ b/src/H5VL.c @@ -84,7 +84,6 @@ H5VLregister_connector(const H5VL_class_t *cls, hid_t vipl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "*#i", cls, vipl_id); /* Check VOL initialization property list */ if (H5P_DEFAULT == vipl_id) @@ -123,7 +122,6 @@ H5VLregister_connector_by_name(const char *name, hid_t vipl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "*si", name, vipl_id); /* Check arguments */ if (!name) @@ -169,7 +167,6 @@ H5VLregister_connector_by_value(H5VL_class_value_t value, hid_t vipl_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE2("i", "VCi", value, vipl_id); /* Check arguments */ if (value < 0) @@ -208,7 +205,6 @@ H5VLis_connector_registered_by_name(const char *name) htri_t ret_value = false; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "*s", name); /* Check if connector with this name is registered */ if ((ret_value = H5VL__is_connector_registered_by_name(name)) < 0) @@ -236,7 +232,6 @@ H5VLis_connector_registered_by_value(H5VL_class_value_t connector_value) htri_t ret_value = false; FUNC_ENTER_API(FAIL) - H5TRACE1("t", "VC", connector_value); /* Check if connector with this value is registered */ if ((ret_value = H5VL__is_connector_registered_by_value(connector_value)) < 0) @@ -264,7 +259,6 @@ H5VLget_connector_id(hid_t obj_id) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "i", obj_id); /* Get connector ID */ if ((ret_value = H5VL__get_connector_id(obj_id, true)) < 0) @@ -294,7 +288,6 @@ H5VLget_connector_id_by_name(const char *name) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "*s", name); /* Get connector ID with this name */ if ((ret_value = H5VL__get_connector_id_by_name(name, true)) < 0) @@ -324,7 +317,6 @@ H5VLget_connector_id_by_value(H5VL_class_value_t connector_value) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "VC", connector_value); /* Get connector ID with this value */ if ((ret_value = H5VL__get_connector_id_by_value(connector_value, true)) < 0) @@ -355,7 +347,6 @@ H5VLpeek_connector_id_by_name(const char *name) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "*s", name); /* Get connector ID with this name */ if ((ret_value = H5VL__peek_connector_id_by_name(name)) < 0) @@ -386,7 +377,6 @@ H5VLpeek_connector_id_by_value(H5VL_class_value_t value) hid_t ret_value = H5I_INVALID_HID; /* Return value */ FUNC_ENTER_API(H5I_INVALID_HID) - H5TRACE1("i", "VC", value); /* Get connector ID with this value */ if ((ret_value = H5VL__peek_connector_id_by_value(value)) < 0) @@ -419,7 +409,6 @@ H5VLget_connector_name(hid_t obj_id, char *name /*out*/, size_t size) ssize_t ret_value = -1; FUNC_ENTER_API(FAIL) - H5TRACE3("Zs", "i*sz", obj_id, name, size); /* Call internal routine */ if ((ret_value = H5VL__get_connector_name(obj_id, name, size)) < 0) @@ -448,7 +437,6 @@ H5VLclose(hid_t vol_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", vol_id); /* Check args */ if (NULL == H5I_object_verify(vol_id, H5I_VOL)) @@ -486,7 +474,6 @@ H5VLunregister_connector(hid_t vol_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "i", vol_id); /* Check arguments */ if (NULL == H5I_object_verify(vol_id, H5I_VOL)) @@ -531,7 +518,6 @@ H5VLcmp_connector_cls(int *cmp, hid_t connector_id1, hid_t connector_id2) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*Isii", cmp, connector_id1, connector_id2); /* Check args and get class pointers */ if (NULL == (cls1 = (H5VL_class_t *)H5I_object_verify(connector_id1, H5I_VOL))) @@ -572,7 +558,6 @@ H5VLwrap_register(void *obj, H5I_type_t type) /* Use FUNC_ENTER_API_NOINIT here, so the API context doesn't get reset */ FUNC_ENTER_API_NOINIT - H5TRACE2("i", "*xIt", obj, type); /* Check args */ /* Use a switch here for (hopefully) better performance than a series of @@ -635,7 +620,6 @@ H5VLobject(hid_t id) void *ret_value; /* Return value */ FUNC_ENTER_API(NULL) - H5TRACE1("*x", "i", id); /* Retrieve the object pointer for the ID */ if (NULL == (ret_value = H5VL_object(id))) @@ -662,7 +646,6 @@ H5VLobject_is_native(hid_t obj_id, hbool_t *is_native) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*b", obj_id, is_native); if (!is_native) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "`is_native` argument is NULL"); @@ -698,7 +681,6 @@ H5VLget_file_type(void *file_obj, hid_t connector_id, hid_t dtype_id) hid_t ret_value = -1; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("i", "*xii", file_obj, connector_id, dtype_id); /* Check args */ if (!file_obj) @@ -769,7 +751,6 @@ H5VLretrieve_lib_state(void **state /*out*/) /* Must use this, to avoid modifying the API context stack in FUNC_ENTER */ FUNC_ENTER_API_NOINIT - H5TRACE1("e", "**x", state); /* Check args */ if (NULL == state) @@ -803,7 +784,6 @@ H5VLstart_lib_state(void) /* Must use this, to avoid modifying the API context stack in FUNC_ENTER */ FUNC_ENTER_API_NOINIT - H5TRACE0("e", ""); /* Start a new library state */ if (H5VL_start_lib_state() < 0) @@ -833,7 +813,6 @@ H5VLrestore_lib_state(const void *state) /* Must use this, to avoid modifying the API context stack in FUNC_ENTER */ FUNC_ENTER_API_NOINIT - H5TRACE1("e", "*x", state); /* Check args */ if (NULL == state) @@ -872,7 +851,6 @@ H5VLfinish_lib_state(void) /* Must use this, to avoid modifying the API context stack in FUNC_ENTER */ FUNC_ENTER_API_NOINIT - H5TRACE0("e", ""); /* Reset the library state */ if (H5VL_finish_lib_state() < 0) @@ -904,7 +882,6 @@ H5VLfree_lib_state(void *state) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*x", state); /* Check args */ if (NULL == state) @@ -937,7 +914,6 @@ H5VLquery_optional(hid_t obj_id, H5VL_subclass_t subcls, int opt_type, uint64_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "iVSIs*UL", obj_id, subcls, opt_type, flags); /* Check args */ if (NULL == flags) @@ -988,7 +964,6 @@ H5VLregister_opt_operation(H5VL_subclass_t subcls, const char *op_name, int *op_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "VS*s*Is", subcls, op_name, op_val); /* Check args */ if (NULL == op_val) @@ -1027,7 +1002,6 @@ H5VLfind_opt_operation(H5VL_subclass_t subcls, const char *op_name, int *op_val herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "VS*s*Is", subcls, op_name, op_val); /* Check args */ if (NULL == op_val) @@ -1065,7 +1039,6 @@ H5VLunregister_opt_operation(H5VL_subclass_t subcls, const char *op_name) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE2("e", "VS*s", subcls, op_name); /* Check args */ if (NULL == op_name) diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c index 0d7cd1b96bf..f34954d1517 100644 --- a/src/H5VLcallback.c +++ b/src/H5VLcallback.c @@ -222,7 +222,6 @@ H5VLinitialize(hid_t connector_id, hid_t vipl_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE2("e", "ii", connector_id, vipl_id); /* Check args */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -253,7 +252,6 @@ H5VLterminate(hid_t connector_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE1("e", "i", connector_id); /* Check args */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -284,7 +282,6 @@ H5VLget_cap_flags(hid_t connector_id, uint64_t *cap_flags /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE2("e", "i*UL", connector_id, cap_flags); /* Check args */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -315,7 +312,6 @@ H5VLget_value(hid_t connector_id, H5VL_class_value_t *value /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE2("e", "i*VC", connector_id, value); /* Check args */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -434,7 +430,6 @@ H5VLcopy_connector_info(hid_t connector_id, void **dst_vol_info, void *src_vol_i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE3("e", "i**x*x", connector_id, dst_vol_info, src_vol_info); /* Check args and get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -525,7 +520,6 @@ H5VLcmp_connector_info(int *cmp, hid_t connector_id, const void *info1, const vo herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE4("e", "*Isi*x*x", cmp, connector_id, info1, info2); /* Check args and get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -596,7 +590,6 @@ H5VLfree_connector_info(hid_t connector_id, void *info) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE2("e", "i*x", connector_id, info); /* Free the VOL connector info object */ if (H5VL_free_connector_info(connector_id, info) < 0) @@ -622,7 +615,6 @@ H5VLconnector_info_to_str(const void *info, hid_t connector_id, char **str) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE3("e", "*xi**s", info, connector_id, str); /* Only serialize info object, if it's non-NULL */ if (info) { @@ -663,7 +655,6 @@ H5VLconnector_str_to_info(const char *str, hid_t connector_id, void **info /*out herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE3("e", "*si**x", str, connector_id, info); /* Call internal routine */ if (H5VL__connector_str_to_info(str, connector_id, info) < 0) @@ -690,7 +681,6 @@ H5VLget_object(void *obj, hid_t connector_id) void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE2("*x", "*xi", obj, connector_id); /* Check args */ if (NULL == obj) @@ -763,7 +753,6 @@ H5VLget_wrap_ctx(void *obj, hid_t connector_id, void **wrap_ctx /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE3("e", "*xi**x", obj, connector_id, wrap_ctx); /* Check args and get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -828,7 +817,6 @@ H5VLwrap_object(void *obj, H5I_type_t obj_type, hid_t connector_id, void *wrap_c void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("*x", "*xIti*x", obj, obj_type, connector_id, wrap_ctx); /* Check args and get class pointer */ if (NULL == obj) @@ -895,7 +883,6 @@ H5VLunwrap_object(void *obj, hid_t connector_id) void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE2("*x", "*xi", obj, connector_id); /* Check args and get class pointer */ if (NULL == obj) @@ -959,7 +946,6 @@ H5VLfree_wrap_ctx(void *wrap_ctx, hid_t connector_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE2("e", "*xi", wrap_ctx, connector_id); /* Check args and get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -1060,8 +1046,6 @@ H5VLattr_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_ void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE10("*x", "*x*#i*siiiii**x", obj, loc_params, connector_id, name, type_id, space_id, acpl_id, - aapl_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -1163,7 +1147,6 @@ H5VLattr_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE7("*x", "*x*#i*sii**x", obj, loc_params, connector_id, name, aapl_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -1260,7 +1243,6 @@ H5VLattr_read(void *obj, hid_t connector_id, hid_t mem_type_id, void *buf, hid_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*xii*xi**x", obj, connector_id, mem_type_id, buf, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -1359,7 +1341,6 @@ H5VLattr_write(void *obj, hid_t connector_id, hid_t mem_type_id, const void *buf herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*xii*xi**x", obj, connector_id, mem_type_id, buf, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -1456,7 +1437,6 @@ H5VLattr_get(void *obj, hid_t connector_id, H5VL_attr_get_args_t *args, hid_t dx herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -1561,7 +1541,6 @@ H5VLattr_specific(void *obj, const H5VL_loc_params_t *loc_params, hid_t connecto herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*x*#i*!i**x", obj, loc_params, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -1662,7 +1641,6 @@ H5VLattr_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -1699,7 +1677,6 @@ H5VLattr_optional_op(const char *app_file, const char *app_func, unsigned app_li herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIui*!ii", app_file, app_func, app_line, attr_id, args, dxpl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -1796,7 +1773,6 @@ H5VLattr_close(void *obj, hid_t connector_id, hid_t dxpl_id, void **req /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xii**x", obj, connector_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -1902,8 +1878,6 @@ H5VLdataset_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connect void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE11("*x", "*x*#i*siiiiii**x", obj, loc_params, connector_id, name, lcpl_id, type_id, space_id, - dcpl_id, dapl_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -2005,7 +1979,6 @@ H5VLdataset_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE7("*x", "*x*#i*sii**x", obj, loc_params, connector_id, name, dapl_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -2182,8 +2155,6 @@ H5VLdataset_read(size_t count, void *obj[], hid_t connector_id, hid_t mem_type_i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE9("e", "z**xi*i*i*ii**x**x", count, obj, connector_id, mem_type_id, mem_space_id, file_space_id, - dxpl_id, buf, req); /* Check args and get class pointer */ if (NULL == obj) @@ -2372,8 +2343,6 @@ H5VLdataset_write(size_t count, void *obj[], hid_t connector_id, hid_t mem_type_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE9("e", "z**xi*i*i*ii**x**x", count, obj, connector_id, mem_type_id, mem_space_id, file_space_id, - dxpl_id, buf, req); /* Check args and get class pointer */ if (NULL == obj) @@ -2483,7 +2452,6 @@ H5VLdataset_get(void *obj, hid_t connector_id, H5VL_dataset_get_args_t *args, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -2583,7 +2551,6 @@ H5VLdataset_specific(void *obj, hid_t connector_id, H5VL_dataset_specific_args_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -2682,7 +2649,6 @@ H5VLdataset_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -2718,7 +2684,6 @@ H5VLdataset_optional_op(const char *app_file, const char *app_func, unsigned app herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIui*!ii", app_file, app_func, app_line, dset_id, args, dxpl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -2832,7 +2797,6 @@ H5VLdataset_close(void *obj, hid_t connector_id, hid_t dxpl_id, void **req /*out herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xii**x", obj, connector_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -2936,8 +2900,6 @@ H5VLdatatype_commit(void *obj, const H5VL_loc_params_t *loc_params, hid_t connec void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE10("*x", "*x*#i*siiiii**x", obj, loc_params, connector_id, name, type_id, lcpl_id, tcpl_id, - tapl_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -3039,7 +3001,6 @@ H5VLdatatype_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connecto void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE7("*x", "*x*#i*sii**x", obj, loc_params, connector_id, name, tapl_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -3138,7 +3099,6 @@ H5VLdatatype_get(void *obj, hid_t connector_id, H5VL_datatype_get_args_t *args, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -3238,7 +3198,6 @@ H5VLdatatype_specific(void *obj, hid_t connector_id, H5VL_datatype_specific_args herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -3381,7 +3340,6 @@ H5VLdatatype_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -3418,7 +3376,6 @@ H5VLdatatype_optional_op(const char *app_file, const char *app_func, unsigned ap herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIui*!ii", app_file, app_func, app_line, type_id, args, dxpl_id, es_id); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) @@ -3525,7 +3482,6 @@ H5VLdatatype_close(void *obj, hid_t connector_id, hid_t dxpl_id, void **req /*ou herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xii**x", obj, connector_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -3628,7 +3584,6 @@ H5VLfile_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("*x", "*sIuiii**x", name, flags, fcpl_id, fapl_id, dxpl_id, req); /* Get the VOL info from the fapl */ if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id))) @@ -3889,7 +3844,6 @@ H5VLfile_open(const char *name, unsigned flags, hid_t fapl_id, hid_t dxpl_id, vo void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("*x", "*sIuii**x", name, flags, fapl_id, dxpl_id, req); /* Get the VOL info from the fapl */ if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id))) @@ -3990,7 +3944,6 @@ H5VLfile_get(void *obj, hid_t connector_id, H5VL_file_get_args_t *args, hid_t dx herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -4125,7 +4078,6 @@ H5VLfile_specific(void *obj, hid_t connector_id, H5VL_file_specific_args_t *args herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -4221,7 +4173,6 @@ H5VLfile_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -4257,7 +4208,6 @@ H5VLfile_optional_op(const char *app_file, const char *app_func, unsigned app_li herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIui*!ii", app_file, app_func, app_line, file_id, args, dxpl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -4365,7 +4315,6 @@ H5VLfile_close(void *obj, hid_t connector_id, hid_t dxpl_id, void **req /*out*/) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xii**x", obj, connector_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -4467,8 +4416,6 @@ H5VLgroup_create(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE9("*x", "*x*#i*siiii**x", obj, loc_params, connector_id, name, lcpl_id, gcpl_id, gapl_id, dxpl_id, - req); /* Check args and get class pointer */ if (NULL == obj) @@ -4570,7 +4517,6 @@ H5VLgroup_open(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_i void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE7("*x", "*x*#i*sii**x", obj, loc_params, connector_id, name, gapl_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -4667,7 +4613,6 @@ H5VLgroup_get(void *obj, hid_t connector_id, H5VL_group_get_args_t *args, hid_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -4766,7 +4711,6 @@ H5VLgroup_specific(void *obj, hid_t connector_id, H5VL_group_specific_args_t *ar herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -4867,7 +4811,6 @@ H5VLgroup_optional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hi herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -4904,7 +4847,6 @@ H5VLgroup_optional_op(const char *app_file, const char *app_func, unsigned app_l herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE7("e", "*s*sIui*!ii", app_file, app_func, app_line, group_id, args, dxpl_id, es_id); /* Set up request token pointer for asynchronous operation */ if (H5ES_NONE != es_id) @@ -5012,7 +4954,6 @@ H5VLgroup_close(void *obj, hid_t connector_id, hid_t dxpl_id, void **req /*out*/ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xii**x", obj, connector_id, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -5127,7 +5068,6 @@ H5VLlink_create(H5VL_link_create_args_t *args, void *obj, const H5VL_loc_params_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE8("e", "*!*x*#iiii**x", args, obj, loc_params, connector_id, lcpl_id, lapl_id, dxpl_id, req); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -5233,8 +5173,6 @@ H5VLlink_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, void *dst_obj herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE9("e", "*x*#*x*#iiii**x", src_obj, loc_params1, dst_obj, loc_params2, connector_id, lcpl_id, - lapl_id, dxpl_id, req); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -5340,8 +5278,6 @@ H5VLlink_move(void *src_obj, const H5VL_loc_params_t *loc_params1, void *dst_obj herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE9("e", "*x*#*x*#iiii**x", src_obj, loc_params1, dst_obj, loc_params2, connector_id, lcpl_id, - lapl_id, dxpl_id, req); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -5439,7 +5375,6 @@ H5VLlink_get(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_id, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*x*#i*!i**x", obj, loc_params, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -5542,7 +5477,6 @@ H5VLlink_specific(void *obj, const H5VL_loc_params_t *loc_params, hid_t connecto herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*x*#i*!i**x", obj, loc_params, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -5643,7 +5577,6 @@ H5VLlink_optional(void *obj, const H5VL_loc_params_t *loc_params, hid_t connecto herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*x*#i*!i**x", obj, loc_params, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -5681,8 +5614,6 @@ H5VLlink_optional_op(const char *app_file, const char *app_func, unsigned app_li herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*s*sIui*si*!ii", app_file, app_func, app_line, loc_id, name, lapl_id, args, dxpl_id, - es_id); /* Check arguments */ /* name is verified in H5VL_setup_name_args() */ @@ -5805,7 +5736,6 @@ H5VLobject_open(void *obj, const H5VL_loc_params_t *params, hid_t connector_id, void *ret_value = NULL; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("*x", "*x*#i*Iti**x", obj, params, connector_id, opened_type, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -5915,8 +5845,6 @@ H5VLobject_copy(void *src_obj, const H5VL_loc_params_t *src_loc_params, const ch herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE11("e", "*x*#*s*x*#*siiii**x", src_obj, src_loc_params, src_name, dst_obj, dst_loc_params, - dst_name, connector_id, ocpypl_id, lcpl_id, dxpl_id, req); /* Check args and get class pointers */ if (NULL == src_obj || NULL == dst_obj) @@ -6017,7 +5945,6 @@ H5VLobject_get(void *obj, const H5VL_loc_params_t *loc_params, hid_t connector_i herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*x*#i*!i**x", obj, loc_params, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -6120,7 +6047,6 @@ H5VLobject_specific(void *obj, const H5VL_loc_params_t *loc_params, hid_t connec herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*x*#i*!i**x", obj, loc_params, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -6221,7 +6147,6 @@ H5VLobject_optional(void *obj, const H5VL_loc_params_t *loc_params, hid_t connec herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*x*#i*!i**x", obj, loc_params, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) @@ -6260,8 +6185,6 @@ H5VLobject_optional_op(const char *app_file, const char *app_func, unsigned app_ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE9("e", "*s*sIui*si*!ii", app_file, app_func, app_line, loc_id, name, lapl_id, args, dxpl_id, - es_id); /* Check arguments */ /* name is verified in H5VL_setup_name_args() */ @@ -6392,7 +6315,6 @@ H5VLintrospect_get_conn_cls(void *obj, hid_t connector_id, H5VL_get_conn_lvl_t l herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xiVL**#", obj, connector_id, lvl, conn_cls); /* Check args */ if (NULL == obj) @@ -6464,7 +6386,6 @@ H5VLintrospect_get_cap_flags(const void *info, hid_t connector_id, uint64_t *cap herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE3("e", "*xi*UL", info, connector_id, cap_flags); /* Check args */ if (NULL == cap_flags) @@ -6568,7 +6489,6 @@ H5VLintrospect_opt_query(void *obj, hid_t connector_id, H5VL_subclass_t subcls, herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xiVSIs*UL", obj, connector_id, subcls, opt_type, flags); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -6671,7 +6591,6 @@ H5VLrequest_wait(void *req, hid_t connector_id, uint64_t timeout, H5VL_request_s herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xiUL*#", req, connector_id, timeout, status); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -6776,7 +6695,6 @@ H5VLrequest_notify(void *req, hid_t connector_id, H5VL_request_notify_t cb, void herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xiVN*x", req, connector_id, cb, ctx); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -6878,7 +6796,6 @@ H5VLrequest_cancel(void *req, hid_t connector_id, H5VL_request_status_t *status herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE3("e", "*xi*#", req, connector_id, status); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -6982,7 +6899,6 @@ H5VLrequest_specific(void *req, hid_t connector_id, H5VL_request_specific_args_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE3("e", "*xi*!", req, connector_id, args); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -7087,7 +7003,6 @@ H5VLrequest_optional(void *req, hid_t connector_id, H5VL_optional_args_t *args) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE3("e", "*xi*!", req, connector_id, args); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -7119,7 +7034,6 @@ H5VLrequest_optional_op(void *req, hid_t connector_id, H5VL_optional_args_t *arg herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "*xi*!", req, connector_id, args); /* Check arguments */ if (NULL == req) @@ -7227,7 +7141,6 @@ H5VLrequest_free(void *req, hid_t connector_id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE2("e", "*xi", req, connector_id); /* Get class pointer */ if (NULL == (cls = (H5VL_class_t *)H5I_object_verify(connector_id, H5I_VOL))) @@ -7320,7 +7233,6 @@ H5VLblob_put(void *obj, hid_t connector_id, const void *buf, size_t size, void * herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*xi*xz*x*x", obj, connector_id, buf, size, blob_id, ctx); /* Get class pointer */ if (NULL == obj) @@ -7415,7 +7327,6 @@ H5VLblob_get(void *obj, hid_t connector_id, const void *blob_id, void *buf /*out herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE6("e", "*xi*x*xz*x", obj, connector_id, blob_id, buf, size, ctx); /* Get class pointer */ if (NULL == obj) @@ -7509,7 +7420,6 @@ H5VLblob_specific(void *obj, hid_t connector_id, void *blob_id, H5VL_blob_specif herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xi*x*!", obj, connector_id, blob_id, args); /* Get class pointer */ if (NULL == obj) @@ -7603,7 +7513,6 @@ H5VLblob_optional(void *obj, hid_t connector_id, void *blob_id, H5VL_optional_ar herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE4("e", "*xi*x*!", obj, connector_id, blob_id, args); /* Get class pointer */ if (NULL == obj) @@ -7725,7 +7634,6 @@ H5VLtoken_cmp(void *obj, hid_t connector_id, const H5O_token_t *token1, const H5 herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*k*k*Is", obj, connector_id, token1, token2, cmp_value); /* Check args and get class pointer */ if (NULL == obj) @@ -7830,7 +7738,6 @@ H5VLtoken_to_str(void *obj, H5I_type_t obj_type, hid_t connector_id, const H5O_t herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xIti*k**s", obj, obj_type, connector_id, token, token_str); /* Check args and get class pointer */ if (NULL == obj) @@ -7937,7 +7844,6 @@ H5VLtoken_from_str(void *obj, H5I_type_t obj_type, hid_t connector_id, const cha herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xIti*s*k", obj, obj_type, connector_id, token_str, token); /* Check args and get class pointer */ if (NULL == obj) @@ -8038,7 +7944,6 @@ H5VLoptional(void *obj, hid_t connector_id, H5VL_optional_args_t *args, hid_t dx herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API_NOINIT - H5TRACE5("e", "*xi*!i**x", obj, connector_id, args, dxpl_id, req); /* Check args and get class pointer */ if (NULL == obj) diff --git a/src/H5VLnative.c b/src/H5VLnative.c index b640cecd507..ceee7f16c43 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -374,7 +374,6 @@ H5VLnative_addr_to_token(hid_t loc_id, haddr_t addr, H5O_token_t *token) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ia*k", loc_id, addr, token); /* Check args */ if (NULL == token) @@ -468,7 +467,6 @@ H5VLnative_token_to_addr(hid_t loc_id, H5O_token_t token, haddr_t *addr) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE3("e", "ik*a", loc_id, token, addr); /* Check args */ if (NULL == addr) diff --git a/src/H5Z.c b/src/H5Z.c index 1895501f085..a7c1d76c782 100644 --- a/src/H5Z.c +++ b/src/H5Z.c @@ -226,7 +226,6 @@ H5Zregister(const void *cls) #endif FUNC_ENTER_API(FAIL) - H5TRACE1("e", "*x", cls); /* Check args */ if (cls_real == NULL) @@ -358,7 +357,6 @@ H5Zunregister(H5Z_filter_t id) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("e", "Zf", id); /* Check args */ if (id < 0 || id > H5Z_FILTER_MAX) @@ -706,7 +704,6 @@ H5Zfilter_avail(H5Z_filter_t id) htri_t ret_value = false; /* Return value */ FUNC_ENTER_API(FAIL) - H5TRACE1("t", "Zf", id); /* Check args */ if (id < 0 || id > H5Z_FILTER_MAX) @@ -1719,7 +1716,6 @@ H5Zget_filter_info(H5Z_filter_t filter, unsigned *filter_config_flags /*out*/) herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "Zf*Iu", filter, filter_config_flags); /* Get the filter info */ if (H5Z_get_filter_info(filter, filter_config_flags) < 0) diff --git a/src/H5private.h b/src/H5private.h index 904aa9f3652..ca103cc7364 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -203,12 +203,6 @@ # define H5_ATTR_DEPRECATED_USED /*void*/ # endif -# ifdef H5_DEBUG_API -# define H5_ATTR_DEBUG_API_USED /*void*/ -# else -# define H5_ATTR_DEBUG_API_USED H5_ATTR_UNUSED -# endif - # ifndef NDEBUG # define H5_ATTR_NDEBUG_UNUSED /*void*/ # else @@ -247,7 +241,6 @@ # define H5_ATTR_FORMAT(X, Y, Z) /*void*/ # define H5_ATTR_UNUSED /*void*/ # define H5_ATTR_NDEBUG_UNUSED /*void*/ -# define H5_ATTR_DEBUG_API_USED /*void*/ # define H5_ATTR_DEPRECATED_USED /*void*/ # define H5_ATTR_PARALLEL_UNUSED /*void*/ # define H5_ATTR_PARALLEL_USED /*void*/ @@ -1147,93 +1140,16 @@ extern H5_debug_t H5_debug_g; extern const char H5build_settings[]; /*------------------------------------------------------------------------- - * Purpose: These macros are inserted automatically just after the - * FUNC_ENTER() macro of API functions and are used to trace - * application program execution. Unless H5_DEBUG_API has been - * defined they are no-ops. + * Purpose: These macros are used to track arguments in event sets and are + * inserted automatically into H5ES_insert() by the bin/trace script * - * Arguments: R - Return type encoded as a string + * Arguments: C - Caller * T - Argument types encoded as a string * A0-An - Arguments. The number at the end of the macro name * indicates the number of arguments. * *------------------------------------------------------------------------- */ -#ifdef H5_DEBUG_API - -#define H5TRACE_DECL \ - const char *RTYPE = NULL; \ - double CALLTIME; - -#define H5TRACE0(R, T) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T) -#define H5TRACE1(R, T, A0) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0) -#define H5TRACE2(R, T, A0, A1) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1) -#define H5TRACE3(R, T, A0, A1, A2) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2) -#define H5TRACE4(R, T, A0, A1, A2, A3) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3) -#define H5TRACE5(R, T, A0, A1, A2, A3, A4) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4) -#define H5TRACE6(R, T, A0, A1, A2, A3, A4, A5) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5) -#define H5TRACE7(R, T, A0, A1, A2, A3, A4, A5, A6) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6) -#define H5TRACE8(R, T, A0, A1, A2, A3, A4, A5, A6, A7) \ - RTYPE = R; \ - CALLTIME = \ - H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, #A7, A7) -#define H5TRACE9(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, \ - #A7, A7, #A8, A8) -#define H5TRACE10(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, \ - #A7, A7, #A8, A8, #A9, A9) -#define H5TRACE11(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, \ - #A7, A7, #A8, A8, #A9, A9, #A10, A10) -#define H5TRACE12(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) \ - RTYPE = R; \ - CALLTIME = H5_trace(NULL, __func__, T, #A0, A0, #A1, A1, #A2, A2, #A3, A3, #A4, A4, #A5, A5, #A6, A6, \ - #A7, A7, #A8, A8, #A9, A9, #A10, A10, #A11, A11) - -#define H5TRACE_RETURN(V) \ - if (RTYPE) { \ - H5_trace(&CALLTIME, __func__, RTYPE, NULL, V); \ - RTYPE = NULL; \ - } -#else -#define H5TRACE_DECL /*void*/ -#define H5TRACE0(R, T) /*void*/ -#define H5TRACE1(R, T, A0) /*void*/ -#define H5TRACE2(R, T, A0, A1) /*void*/ -#define H5TRACE3(R, T, A0, A1, A2) /*void*/ -#define H5TRACE4(R, T, A0, A1, A2, A3) /*void*/ -#define H5TRACE5(R, T, A0, A1, A2, A3, A4) /*void*/ -#define H5TRACE6(R, T, A0, A1, A2, A3, A4, A5) /*void*/ -#define H5TRACE7(R, T, A0, A1, A2, A3, A4, A5, A6) /*void*/ -#define H5TRACE8(R, T, A0, A1, A2, A3, A4, A5, A6, A7) /*void*/ -#define H5TRACE9(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8) /*void*/ -#define H5TRACE10(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9) /*void*/ -#define H5TRACE11(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10) /*void*/ -#define H5TRACE12(R, T, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) /*void*/ -#define H5TRACE_RETURN(V) /*void*/ -#endif /* H5_DEBUG_API */ - -/* Argument tracing macros (defined all the time) */ #define H5ARG_TRACE0(C, T) C, T #define H5ARG_TRACE1(C, T, A0) C, T, #A0, A0 #define H5ARG_TRACE2(C, T, A0, A1) C, T, #A0, A0, #A1, A1 @@ -1427,11 +1343,7 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props); H5_API_UNSET_CANCEL \ H5_API_LOCK -/* Local variables for API routines */ -#define FUNC_ENTER_API_VARS H5TRACE_DECL - #define FUNC_ENTER_API_COMMON \ - FUNC_ENTER_API_VARS \ FUNC_ENTER_COMMON(H5_IS_API(__func__)); \ FUNC_ENTER_API_THREADSAFE; @@ -1506,7 +1418,6 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props); { \ { \ { \ - FUNC_ENTER_API_VARS \ FUNC_ENTER_COMMON_NOERR(H5_IS_API(__func__)); \ FUNC_ENTER_API_THREADSAFE; \ { @@ -1699,12 +1610,9 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props); H5_API_UNLOCK \ H5_API_SET_CANCEL -#define FUNC_LEAVE_API_COMMON(ret_value) H5TRACE_RETURN(ret_value); - #define FUNC_LEAVE_API(ret_value) \ ; \ } /*end scope from end of FUNC_ENTER*/ \ - FUNC_LEAVE_API_COMMON(ret_value); \ if (api_ctx_pushed) { \ (void)H5CX_pop(true); \ api_ctx_pushed = false; \ @@ -1721,7 +1629,6 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props); #define FUNC_LEAVE_API_NOINIT(ret_value) \ ; \ } /*end scope from end of FUNC_ENTER*/ \ - FUNC_LEAVE_API_COMMON(ret_value); \ H5_POP_FUNC \ if (err_occurred) \ (void)H5E_dump_api_stack(true); \ @@ -1735,7 +1642,6 @@ H5_DLL herr_t H5CX_pop(bool update_dxpl_props); #define FUNC_LEAVE_API_NOFS(ret_value) \ ; \ } /*end scope from end of FUNC_ENTER*/ \ - FUNC_LEAVE_API_COMMON(ret_value); \ FUNC_LEAVE_API_THREADSAFE \ return (ret_value); \ } \