[svn-r13097] Description:

    Checkpoint changes for bug fix, to shift coding to another machine.

Tested on:
    Linux/32 2.6 (chicago)

2 files changed, 29 insertions, 0 deletions

diff --git a/src/H5O.c b/src/H5O.c
index 2994e8d..a1ee858 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -1357,6 +1357,21 @@ H5O_modify_real(H5G_entry_t *ent, const H5O_msg_class_t *type, int overwrite,
     } /* end if */
 
     /* Check for creating new message */
+/* XXX: fix me */
+#ifdef NOT_YET
+HDfprintf(stderr, "%s: overwrite = %d\n", FUNC, overwrite);
+if(overwrite >= 0 && !(oh->mesg[idx].flags & H5O_FLAG_SHARED)) {
+    H5O_mesg_t *curr_msg = &oh->mesg[idx];
+    size_t msg_size;
+
+    HDfprintf(stderr, "%s: curr_msg->type->name = '%s'\n", FUNC, curr_msg->type->name);
+    HDfprintf(stderr, "%s: curr_msg->raw_size = %Zu\n", FUNC, curr_msg->raw_size);
+    msg_size = curr_msg->type->raw_size(ent->file, mesg);
+    HDfprintf(stderr, "%s: msg_size = %Zu\n", FUNC, msg_size);
+    if(msg_size > curr_msg->raw_size)
+        HDfprintf(stderr, "%s: YOW!\n", FUNC);
+} /* end if */
+#endif /* NOT_YET */
     if(overwrite < 0) {
         /* Create a new message */
         if((idx=H5O_new_mesg(ent->file,oh,&flags,type,mesg,&sh_mesg,&type,&mesg,dxpl_id))==UFAIL)
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 796a29e..24b9e3c 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -153,6 +153,20 @@ H5O_flush_msgs(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                     encode = H5O_MSG_SHARED->encode;
                 else
                     encode = curr_msg->type->encode;
+/* XXX: fix me */
+#ifdef NOT_YET
+if(!(curr_msg->flags & H5O_FLAG_SHARED)) {
+    size_t msg_size;
+
+    HDfprintf(stderr, "%s: curr_msg->type->name = '%s'\n", FUNC, curr_msg->type->name);
+    HDfprintf(stderr, "%s: curr_msg->raw_size = %Zu\n", FUNC, curr_msg->raw_size);
+    msg_size = curr_msg->type->raw_size(f, curr_msg->native);
+    HDfprintf(stderr, "%s: msg_size = %Zu\n", FUNC, msg_size);
+    if(msg_size > curr_msg->raw_size)
+        HDfprintf(stderr, "%s: YOW!\n", FUNC);
+} /* end if */
+#endif /* NOT_YET */
+
                 if((encode)(f, curr_msg->raw, curr_msg->native) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTENCODE, FAIL, "unable to encode object header message")
             } /* end if */