summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2009-01-29 20:52:44 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2009-01-29 20:52:44 (GMT)
commitf7464a512916d18cd7f3d04393ce8ddb1f16c5aa (patch)
tree0df83aac5f986586ed9fe6696008bcc4c0cdb7aa /src
parent5a9903cdde6220e2d6e05fb60b516baeee520161 (diff)
downloadhdf5-f7464a512916d18cd7f3d04393ce8ddb1f16c5aa.zip
hdf5-f7464a512916d18cd7f3d04393ce8ddb1f16c5aa.tar.gz
hdf5-f7464a512916d18cd7f3d04393ce8ddb1f16c5aa.tar.bz2
[svn-r16378] Description:
Changed max macro in earray.c to avoid Windows conflict. Changed if(test) to assert(test) in H5FDcore.c - H5FD_core_open() Tested on: Windows: XP32, XP64, Vista32, Vista64 H5committest.
Diffstat (limited to 'src')
-rw-r--r--src/H5FDcore.c48
1 files changed, 25 insertions, 23 deletions
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index cda7308..d2608d0 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -137,7 +137,7 @@ static const H5FD_class_t H5FD_core_g = {
H5FD_FLMAP_SINGLE /*fl_map */
};
-
+
/*--------------------------------------------------------------------------
NAME
H5FD_core_init_interface -- Initialize interface-specific information
@@ -159,7 +159,7 @@ H5FD_core_init_interface(void)
FUNC_LEAVE_NOAPI(H5FD_core_init())
} /* H5FD_core_init_interface() */
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_init
*
@@ -194,7 +194,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*---------------------------------------------------------------------------
* Function: H5FD_core_term
*
@@ -220,7 +220,7 @@ H5FD_core_term(void)
FUNC_LEAVE_NOAPI_VOID
} /* end H5FD_core_term() */
-
+
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_core
*
@@ -267,7 +267,7 @@ done:
FUNC_LEAVE_API(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5Pget_fapl_core
*
@@ -317,7 +317,7 @@ done:
FUNC_LEAVE_API(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_fapl_get
*
@@ -356,7 +356,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_open
*
@@ -378,6 +378,9 @@ done:
* Raymond Lu, 2006-11-30
* Enabled the driver to read an existing file depending on
* the setting of the backing_store and file open flags.
+ *
+ * Allen Byrne, 2008-1-23
+ * changed if of fapl_id to assert
*-------------------------------------------------------------------------
*/
static H5FD_t *
@@ -401,11 +404,10 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id,
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
if(ADDR_OVERFLOW(maxaddr))
HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "maxaddr overflow")
- if(H5P_DEFAULT != fapl_id) {
- if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
- fa = (H5FD_core_fapl_t *)H5P_get_driver_info(plist);
- } /* end if */
+ assert(H5P_DEFAULT != fapl_id);
+ if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
+ fa = (H5FD_core_fapl_t *)H5P_get_driver_info(plist);
/* Build the open flags */
o_flags = (H5F_ACC_RDWR & flags) ? O_RDWR : O_RDONLY;
@@ -469,7 +471,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_close
*
@@ -510,7 +512,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_cmp
*
@@ -559,7 +561,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_query
*
@@ -595,7 +597,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_core_query() */
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_get_eoa
*
@@ -633,7 +635,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_set_eoa
*
@@ -672,7 +674,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_core_set_eoa() */
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_get_eof
*
@@ -709,7 +711,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_get_handle
*
@@ -742,7 +744,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_read
*
@@ -810,7 +812,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_write
*
@@ -882,7 +884,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_core_write() */
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_flush
*
@@ -938,7 +940,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
}
-
+
/*-------------------------------------------------------------------------
* Function: H5FD_core_truncate
*