summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-12-14 10:50:43 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-12-14 10:50:43 (GMT)
commit2cb441c507dfbd4437ccf29e232a9b730e6e1003 (patch)
tree92bfce726bb40ed8b11bc34691d8f29e7da9626d
parent7e4fb729137dff3851122be63beabfc03137be4a (diff)
downloadhdf5-2cb441c507dfbd4437ccf29e232a9b730e6e1003.zip
hdf5-2cb441c507dfbd4437ccf29e232a9b730e6e1003.tar.gz
hdf5-2cb441c507dfbd4437ccf29e232a9b730e6e1003.tar.bz2
[svn-r28629] Minor normalization with revise_chunks.
Tested on: Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1 serial only (these changes have been in revise_chunks for a long time)
-rw-r--r--src/H5FL.c3
-rw-r--r--src/H5MM.c35
-rw-r--r--src/H5trace.c4
3 files changed, 18 insertions, 24 deletions
diff --git a/src/H5FL.c b/src/H5FL.c
index fb355ad..00cbf0c 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -314,8 +314,7 @@ done:
*
* Purpose: Release an object & put on free list
*
- * Return: Success: Non-negative
- * Failure: Negative
+ * Return: Always returns NULL
*
* Programmer: Quincey Koziol
* Friday, March 24, 2000
diff --git a/src/H5MM.c b/src/H5MM.c
index 534526f..a37bbff 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -15,13 +15,11 @@
/*-------------------------------------------------------------------------
*
- * Created: H5MM.c
- * Jul 10 1997
- * Robb Matzke <matzke@llnl.gov>
- *
- * Purpose: Memory management functions.
+ * Created: H5MM.c
+ * Jul 10 1997
+ * Robb Matzke <matzke@llnl.gov>
*
- * Modifications:
+ * Purpose: Memory management functions
*
*-------------------------------------------------------------------------
*/
@@ -168,7 +166,6 @@ H5MM_realloc(void *mem, size_t size)
* NULL is an acceptable value for the input string.
*
* Return: Success: Pointer to a new string (NULL if s is NULL).
- *
* Failure: abort()
*
* Programmer: Robb Matzke
@@ -179,7 +176,7 @@ H5MM_realloc(void *mem, size_t size)
char *
H5MM_xstrdup(const char *s)
{
- char *ret_value = NULL;
+ char *ret_value = NULL;
FUNC_ENTER_NOAPI(NULL)
@@ -204,7 +201,6 @@ done:
* an error will be raised.
*
* Return: Success: Pointer to a new string
- *
* Failure: abort()
*
* Programmer: Robb Matzke
@@ -231,21 +227,20 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5MM_xfree
+ * Function: H5MM_xfree
*
- * Purpose: Just like free(3) except null pointers are allowed as
- * arguments, and the return value (always NULL) can be
- * assigned to the pointer whose memory was just freed:
+ * Purpose: Just like free(3) except null pointers are allowed as
+ * arguments, and the return value (always NULL) can be
+ * assigned to the pointer whose memory was just freed:
*
- * thing = H5MM_xfree (thing);
+ * thing = H5MM_xfree (thing);
*
- * Return: Success: NULL
+ * Return: Success: NULL
+ * Failure: never fails
*
- * Failure: never fails
- *
- * Programmer: Robb Matzke
- * matzke@llnl.gov
- * Jul 10 1997
+ * Programmer: Robb Matzke
+ * matzke@llnl.gov
+ * Jul 10 1997
*
*-------------------------------------------------------------------------
*/
diff --git a/src/H5trace.c b/src/H5trace.c
index 3b29cda..2fd75ac 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -268,8 +268,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
fprintf(out, "NULL");
} /* end if */
else {
- hbool_t bool_var = va_arg(ap, hbool_t); /*lint !e732 Loss of sign not really occuring */
-
+ /* Can't pass hbool_t to va_arg() */
+ hbool_t bool_var = (hbool_t)va_arg(ap, int);
if(TRUE == bool_var)
fprintf(out, "TRUE");
else if(!bool_var)