From fbb2d4929f90aec862b963d224aeb586aae33c64 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Thu, 26 Mar 2015 18:06:44 +0530 Subject: [PATCH] registry: Fix 1273042 Identical code for if/else branch Signed-off-by: Anoop C S Reviewed-by: Michael Adam Reviewed-by: Volker Lendecke Reviewed-by: Ira Cooper Reviewed-by: Guenther Deschner --- source3/registry/reg_perfcount.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c index f78ab44e0a1..57ce3075eb9 100644 --- a/source3/registry/reg_perfcount.c +++ b/source3/registry/reg_perfcount.c @@ -1145,16 +1145,8 @@ static uint32 reg_perfcount_get_perf_data_block(uint32 base_index, reg_perfcount_get_last_counter(base_index); - if(object_ids == NULL) - { - /* we're getting a request for "Global" here */ - retval = _reg_perfcount_assemble_global(block, mem_ctx, base_index, names); - } - else - { - /* we're getting a request for a specific set of PERF_OBJECT_TYPES */ - retval = _reg_perfcount_assemble_global(block, mem_ctx, base_index, names); - } + retval = _reg_perfcount_assemble_global(block, mem_ctx, base_index, names); + buffer_size = _reg_perfcount_perf_data_block_fixup(block, mem_ctx); tdb_close(names); -- 2.11.4.GIT