summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-04-21 15:36:22 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-04-21 15:36:22 (GMT)
commit5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5 (patch)
tree22b52f467386617b960536cbc5cce160951c70f1
parentd7573cbc857f5a2a843a42b3ea05cd9d3770208d (diff)
downloadhdf5-5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5.zip
hdf5-5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5.tar.gz
hdf5-5eb6bc4dfebffadaa6de112b66f43e20bad9d0c5.tar.bz2
[svn-r12293] Purpose:
Bug fix Description: Fix missing error code from flexible parallel removal Platforms tested: IBM AIX (copper) w/parallel
-rw-r--r--src/H5Edefin.h1
-rw-r--r--src/H5Einit.h5
-rw-r--r--src/H5Epubgen.h2
-rw-r--r--src/H5Eterm.h3
-rw-r--r--src/H5err.txt1
5 files changed, 11 insertions, 1 deletions
diff --git a/src/H5Edefin.h b/src/H5Edefin.h
index 91b9b9c..1bdd4ba 100644
--- a/src/H5Edefin.h
+++ b/src/H5Edefin.h
@@ -149,6 +149,7 @@ hid_t H5E_CANTDIRTY_g = FAIL; /* Unable to mark metadata as dirty */
/* Parallel MPI errors */
hid_t H5E_MPI_g = FAIL; /* Some MPI function failed */
hid_t H5E_MPIERRSTR_g = FAIL; /* MPI Error String */
+hid_t H5E_CANTRECV_g = FAIL; /* Can't receive data */
/* Dataspace errors */
hid_t H5E_CANTCLIP_g = FAIL; /* Can't clip hyperslab region */
diff --git a/src/H5Einit.h b/src/H5Einit.h
index b2ad44e..c35cab5 100644
--- a/src/H5Einit.h
+++ b/src/H5Einit.h
@@ -551,6 +551,11 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL)
HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTRECV_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't receive data"))==NULL)
+ HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+ HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
/* Dataspace errors */
assert(H5E_CANTCLIP_g==(-1));
diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h
index 64ccf76..7d9e284 100644
--- a/src/H5Epubgen.h
+++ b/src/H5Epubgen.h
@@ -251,8 +251,10 @@ H5_DLLVAR hid_t H5E_CANTDIRTY_g; /* Unable to mark metadata as dirty */
/* Parallel MPI errors */
#define H5E_MPI (H5OPEN H5E_MPI_g)
#define H5E_MPIERRSTR (H5OPEN H5E_MPIERRSTR_g)
+#define H5E_CANTRECV (H5OPEN H5E_CANTRECV_g)
H5_DLLVAR hid_t H5E_MPI_g; /* Some MPI function failed */
H5_DLLVAR hid_t H5E_MPIERRSTR_g; /* MPI Error String */
+H5_DLLVAR hid_t H5E_CANTRECV_g; /* Can't receive data */
/* Dataspace errors */
#define H5E_CANTCLIP (H5OPEN H5E_CANTCLIP_g)
diff --git a/src/H5Eterm.h b/src/H5Eterm.h
index e6795cf..d7afed8 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -150,7 +150,8 @@ H5E_CANTDIRTY_g=
/* Parallel MPI errors */
H5E_MPI_g=
-H5E_MPIERRSTR_g=
+H5E_MPIERRSTR_g=
+H5E_CANTRECV_g=
/* Dataspace errors */
H5E_CANTCLIP_g=
diff --git a/src/H5err.txt b/src/H5err.txt
index 0624578..bd3e06a 100644
--- a/src/H5err.txt
+++ b/src/H5err.txt
@@ -206,6 +206,7 @@ MINOR, PLIST, H5E_DUPCLASS, Duplicate class name in parent class
# Parallel MPI errors
MINOR, MPI, H5E_MPI, Some MPI function failed
MINOR, MPI, H5E_MPIERRSTR, MPI Error String
+MINOR, MPI, H5E_CANTRECV, Can't receive data
# Heap errors
MINOR, HEAP, H5E_CANTRESTORE, Can't restore condition