diff options
| author | Anoop C S <achiraya@redhat.com> | 2015-03-26 18:06:44 +0530 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2015-03-26 14:54:20 +0100 |
| commit | fbb2d4929f90aec862b963d224aeb586aae33c64 (patch) | |
| tree | f3585b46182627af3acd764d66e3d3dc60da8496 /source3/registry | |
| parent | 508b45fca93ca2dfb048fdf7465602bc34df42db (diff) | |
| download | samba-fbb2d4929f90aec862b963d224aeb586aae33c64.tar.gz | |
registry: Fix 1273042 Identical code for if/else branch
Signed-off-by: Anoop C S <achiraya@redhat.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source3/registry')
| -rw-r--r-- | source3/registry/reg_perfcount.c | 12 |
1 files 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); |