[svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.

Also warning session fixes.

Tested: CMake local linux
This commit is contained in:
Allen Byrne
2013-09-26 17:10:54 -05:00
parent e2dfb53df7
commit deddc7f955
45 changed files with 5392 additions and 4282 deletions

View File

@@ -15,6 +15,7 @@
#include <stdlib.h>
#include <string.h>
#include "H5private.h"
#include "h5diff.h"
#include "h5diff_common.h"
#include "h5tools.h"
@@ -135,7 +136,7 @@ void parse_command_line(int argc,
options->m_verbose_level = 0;
break;
}
else if (!strncmp (argv[i], "-v", 2))
else if (!strncmp (argv[i], "-v", (size_t)2))
{
options->m_verbose_level = atoi(&argv[i][2]);
break;
@@ -149,7 +150,7 @@ void parse_command_line(int argc,
options->m_verbose_level = 0;
break;
}
else if ( !strncmp (argv[i], "--verbose", 9) && argv[i][9]=='=')
else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=')
{
options->m_verbose_level = atoi(&argv[i][10]);
break;
@@ -164,7 +165,7 @@ void parse_command_line(int argc,
options->m_report = 1;
break;
case 'l':
options->follow_links = 1;
options->follow_links = TRUE;
break;
case 'x':
options->no_dangle_links = 1;