[svn-r22004] Reduced warnings and fixed conflicts resulting from including h5tools.h

Tested: local linux
This commit is contained in:
Allen Byrne
2012-02-28 13:26:34 -05:00
parent 9423da6a4d
commit df6c92e506
33 changed files with 327 additions and 309 deletions

View File

@@ -17,6 +17,7 @@
#include <string.h>
#include "h5diff.h"
#include "h5diff_common.h"
#include "h5tools.h"
#include "h5tools_utils.h"
static int check_n_input( const char* );
@@ -53,7 +54,7 @@ static struct long_options l_opts[] = {
*
*-------------------------------------------------------------------------
*/
static check_options(diff_opt_t* options)
static void check_options(diff_opt_t* options)
{
/*--------------------------------------------------------------
* check for mutually exclusive options
@@ -179,7 +180,7 @@ void parse_command_line(int argc,
}
/* init */
exclude_node->obj_path = opt_arg;
exclude_node->obj_path = (char*)opt_arg;
exclude_node->obj_type = H5TRAV_TYPE_UNKNOWN;
exclude_prev = exclude_head;