aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Alistair Veitch <aveitch@google.com>2015-06-01 14:35:31 -0700
committerGravatar Alistair Veitch <aveitch@google.com>2015-06-01 14:35:31 -0700
commit980ef7666da1fb40ea6430b6bfef383b7d8528ac (patch)
tree818b0b76fd3b8cb5139e2b57701c19f4938cea2b /src/core
parentf3da552d5b62acabd6a3cdb37b1794fa9a50a9a5 (diff)
change census_context_deserialize signature
Diffstat (limited to 'src/core')
-rw-r--r--src/core/census/context.c12
-rw-r--r--src/core/census/grpc_context.c6
2 files changed, 11 insertions, 7 deletions
diff --git a/src/core/census/context.c b/src/core/census/context.c
index a940e96ec0..1358c5127b 100644
--- a/src/core/census/context.c
+++ b/src/core/census/context.c
@@ -45,14 +45,14 @@ size_t census_context_serialize(const census_context *context, char *buffer,
return 0;
}
-census_context *census_context_deserialize(char *buffer) {
- census_context *ret;
+int census_context_deserialize(const char *buffer, census_context **context) {
+ int ret = 0;
if (buffer != NULL) {
- /* TODO(aveitch): implement deserialization */
- return NULL;
+ /* TODO(aveitch): implement deserialization. */
+ ret = 1;
}
- ret = gpr_malloc(sizeof(census_context));
- memset(ret, 0, sizeof(census_context));
+ *context = gpr_malloc(sizeof(census_context));
+ memset(*context, 0, sizeof(census_context));
return ret;
}
diff --git a/src/core/census/grpc_context.c b/src/core/census/grpc_context.c
index 4b1ba49e70..cf2353199f 100644
--- a/src/core/census/grpc_context.c
+++ b/src/core/census/grpc_context.c
@@ -34,7 +34,11 @@
#include <grpc/census.h>
#include "src/core/census/grpc_context.h"
-void *grpc_census_context_create() { return census_context_deserialize(NULL); }
+void *grpc_census_context_create() {
+ census_context *context;
+ census_context_deserialize(NULL, &context);
+ return (void *)context;
+}
void grpc_census_context_destroy(void *context) {
census_context_destroy((census_context *)context);