Merge pull request #4856 from yang-g/deadline
init deadline in server context
diff --git a/include/grpc/census.h b/include/grpc/census.h
index ab0e0e4..f4130c7 100644
--- a/include/grpc/census.h
+++ b/include/grpc/census.h
@@ -506,8 +506,8 @@
construction via census_define_view(). */
typedef struct {
const census_aggregation_ops *ops;
- const void
- *create_arg; /* Argument to be used for aggregation initialization. */
+ const void *
+ create_arg; /* Argument to be used for aggregation initialization. */
} census_aggregation;
/** A census view type. Opaque. */
diff --git a/src/core/census/tag_set.c b/src/core/census/tag_set.c
index 8908a2d..9b65a1d 100644
--- a/src/core/census/tag_set.c
+++ b/src/core/census/tag_set.c
@@ -253,7 +253,7 @@
if (tags->ntags == tags->ntags_alloc) return;
bool found_deleted = false; // found a deleted tag.
char *kvp = tags->kvm;
- char *dbase; // record location of deleted tag
+ char *dbase = NULL; // record location of deleted tag
for (int i = 0; i < tags->ntags_alloc; i++) {
struct raw_tag tag;
char *next_kvp = decode_tag(&tag, kvp, 0);
diff --git a/test/core/census/tag_set_test.c b/test/core/census/tag_set_test.c
index 8e09e6c..1056e98 100644
--- a/test/core/census/tag_set_test.c
+++ b/test/core/census/tag_set_test.c
@@ -319,9 +319,10 @@
census_tag_set_destroy(cts2);
}
+#define BUF_SIZE 200
+
// test encode/decode.
static void encode_decode_test(void) {
- const size_t BUF_SIZE = 200;
char buffer[BUF_SIZE];
struct census_tag_set *cts =
census_tag_set_create(NULL, basic_tags, BASIC_TAG_COUNT, NULL);