registry: Fix 1273042 Identical code for if/else branch
authorAnoop C S <achiraya@redhat.com>
Thu, 26 Mar 2015 12:36:44 +0000 (18:06 +0530)
committerMichael Adam <obnox@samba.org>
Thu, 26 Mar 2015 13:54:20 +0000 (14:54 +0100)
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>
source3/registry/reg_perfcount.c

index f78ab44e0a1397699a189152725167e46556263c..57ce3075eb961c9500cd66f48307d8f776e4fb01 100644 (file)
@@ -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);