aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Bogdan Drutu <bdrutu@google.com>2016-01-27 12:13:44 -0800
committerGravatar Bogdan Drutu <bdrutu@google.com>2016-01-27 12:13:44 -0800
commit9ee560f8b1f9bf48ac753a59efcc6dcd159a2d02 (patch)
treec4facb95617bc981739afaa9d9e746c14d713641
parent0a32766aa29331670db408f1618bfb95f0bd40bf (diff)
parent268c3560405894c91cbd100200a8c6ae563b89a2 (diff)
Merge pull request #4920 from a-veitch/census_init_fix
Remove bad error return in census_initialize
-rw-r--r--src/core/census/initialize.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/census/initialize.c b/src/core/census/initialize.c
index b7af714e0b..ce7ec09b89 100644
--- a/src/core/census/initialize.c
+++ b/src/core/census/initialize.c
@@ -37,9 +37,7 @@ static int features_enabled = CENSUS_FEATURE_NONE;
int census_initialize(int features) {
if (features_enabled != CENSUS_FEATURE_NONE) {
- return 1;
- }
- if (features == CENSUS_FEATURE_NONE) {
+ // Must have been a previous call to census_initialize; return error
return 1;
}
features_enabled = features;