minor changes to prox/replica recv

This commit was SVN r2232.

src/mca/gpr/proxy/gpr_proxy.c

@@ -6,6 +6,8 @@
  */
 
 #include "ompi_config.h"
+
+#include <string.h>
 #include "mca/mca.h"
 #include "mca/gpr/base/base.h"
 #include "gpr_proxy.h"
@@ -52,12 +54,13 @@ int gpr_proxy_put(ompi_registry_mode_t mode, char *segment,
 	return OMPI_ERROR;
     }
 
-    if (OMPI_SUCCESS != ompi_pack(cmd, segment, 1, OMPI_STRING)) {
+    if (OMPI_SUCCESS != ompi_pack_string(cmd, segment)) {
 	return OMPI_ERROR;
     }
 
     /* compute number of tokens */
     tokptr = tokens;
+    num_tokens = 0;
     while (NULL != *tokptr) {
 	num_tokens++;
 	tokptr++;

src/mca/gpr/replica/gpr_replica_component.c

@@ -332,7 +332,7 @@ void mca_gpr_replica_recv(int status, ompi_process_name_t* sender,
     }
 
     if (MCA_GPR_DELETE_SEGMENT_CMD == command) {   /* got command to delete a segment */
-	if (OMPI_SUCCESS != ompi_unpack_string(buffer, &segment)) {
+	if (0 > ompi_unpack_string(buffer, &segment)) {
 	    goto RETURN_ERROR;
 	}
 
@@ -353,7 +353,7 @@ void mca_gpr_replica_recv(int status, ompi_process_name_t* sender,
 	    goto RETURN_ERROR;
 	}
 
-	if (OMPI_SUCCESS != ompi_unpack_string(buffer, &segment)) {
+	if (0 > ompi_unpack_string(buffer, &segment)) {
 	    goto RETURN_ERROR;
 	}
 
@@ -365,7 +365,7 @@ void mca_gpr_replica_recv(int status, ompi_process_name_t* sender,
 
 	tokptr = tokens;
 	for (i=0; i<num_tokens; i++) {
-	    if (OMPI_SUCCESS != ompi_unpack_string(buffer, tokptr)) {
+	    if (0 > ompi_unpack_string(buffer, tokptr)) {
 		goto RETURN_ERROR;
 	    }
 	    tokptr++;
@@ -398,7 +398,7 @@ void mca_gpr_replica_recv(int status, ompi_process_name_t* sender,
 	    goto RETURN_ERROR;
 	}
 
-	if (OMPI_SUCCESS != ompi_unpack_string(buffer, &segment)) {
+	if (0 > ompi_unpack_string(buffer, &segment)) {
 	    goto RETURN_ERROR;
 	}
 
@@ -409,7 +409,7 @@ void mca_gpr_replica_recv(int status, ompi_process_name_t* sender,
 	tokens = (char**)malloc(num_tokens*sizeof(char*));
 	tokptr = tokens;
 	for (i=0; i<num_tokens; i++) {
-	    if (OMPI_SUCCESS != ompi_unpack_string(buffer, tokptr)) {
+	    if (0 > ompi_unpack_string(buffer, tokptr)) {
 		goto RETURN_ERROR;
 	    }
 	    tokptr++;

src/mca/gpr/replica/gpr_replica_internals.c

@@ -11,6 +11,8 @@
  * includes
  */
 
+#include "ompi_config.h"
+
 #include <stdio.h>
 #include <stdint.h>
 #include <stdarg.h>
@@ -18,7 +20,6 @@
 #include <unistd.h>
 #include <libgen.h>
 
-#include "ompi_config.h"
 #include "include/constants.h"
 #include "util/output.h"
 #include "mca/mca.h"