From b9609203b7950c2ebbcd4c5a0ce6d5abc7463f05 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 12 Nov 2012 02:52:37 +0000 Subject: [PATCH] Pack the buffer object from the beginning This commit was SVN r27592. --- opal/dss/dss_pack.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/opal/dss/dss_pack.c b/opal/dss/dss_pack.c index abc195cf8a..0305753ff3 100644 --- a/opal/dss/dss_pack.c +++ b/opal/dss/dss_pack.c @@ -632,19 +632,17 @@ int opal_dss_pack_buffer_contents(opal_buffer_t *buffer, const void *src, opal_buffer_t **ptr; int32_t i; int ret; - size_t offset, bytes_to_pack; ptr = (opal_buffer_t **) src; for (i = 0; i < num_vals; ++i) { /* pack the number of bytes */ - offset = ((char*)ptr[i]->unpack_ptr) - ((char*)ptr[i]->base_ptr); - bytes_to_pack = ptr[i]->bytes_used - offset; - if (OPAL_SUCCESS != (ret = opal_dss_pack_sizet(buffer, &bytes_to_pack, 1, OPAL_SIZE))) { + OPAL_OUTPUT((opal_dss_verbose, "opal_dss_pack_buffer_contents: bytes_used %u\n", (unsigned)ptr[i]->bytes_used)); + if (OPAL_SUCCESS != (ret = opal_dss_pack_sizet(buffer, &ptr[i]->bytes_used, 1, OPAL_SIZE))) { return ret; } /* pack the bytes */ - if (OPAL_SUCCESS != (ret = opal_dss_pack_byte(buffer, ptr[i]->unpack_ptr, bytes_to_pack, OPAL_BYTE))) { + if (OPAL_SUCCESS != (ret = opal_dss_pack_byte(buffer, ptr[i]->base_ptr, ptr[i]->bytes_used, OPAL_BYTE))) { return ret; } }