diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-15 11:39:08 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-15 11:39:08 -0800 |
| commit | 17fe83b5badc51761953654823319cbc450dc977 (patch) | |
| tree | 5ff5d2e9587c2232ab62066f995ffd88b6d63881 /src/core/census/initialize.c | |
| parent | 45484b31bbe736d6effb630ca0bc642856e883d1 (diff) | |
| parent | 15bad3fba745043aa9b1cef83e4929486b40a548 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into check_newlines
Diffstat (limited to 'src/core/census/initialize.c')
| -rw-r--r-- | src/core/census/initialize.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/census/initialize.c b/src/core/census/initialize.c index 8d60f790eb..989708d42c 100644 --- a/src/core/census/initialize.c +++ b/src/core/census/initialize.c @@ -39,12 +39,11 @@ int census_initialize(int features) { if (features_enabled != CENSUS_FEATURE_NONE) { return 1; } - if (features != CENSUS_FEATURE_NONE) { + if (features == CENSUS_FEATURE_NONE) { return 1; - } else { - features_enabled = features; - return 0; } + features_enabled = features; + return 0; } void census_shutdown(void) { features_enabled = CENSUS_FEATURE_NONE; } |