tools: bpftool: remove unnecessary 'if' to reduce indentation
authorJiong Wang <jiong.wang@netronome.com>
Fri, 2 Mar 2018 02:01:16 +0000 (18:01 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 2 Mar 2018 02:29:48 +0000 (18:29 -0800)
It is obvious we could use 'else if' instead of start a new 'if' in the
touched code.

Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
tools/bpf/bpftool/prog.c

index e549e329be8216646dbab3c11a6485d85d02f1c6..950d11dd42ab7135169aa23f352784c2f0b7e941 100644 (file)
@@ -777,27 +777,25 @@ static int do_dump(int argc, char **argv)
 
                if (json_output)
                        jsonw_null(json_wtr);
-       } else {
-               if (member_len == &info.jited_prog_len) {
-                       const char *name = NULL;
-
-                       if (info.ifindex) {
-                               name = ifindex_to_bfd_name_ns(info.ifindex,
-                                                             info.netns_dev,
-                                                             info.netns_ino);
-                               if (!name)
-                                       goto err_free;
-                       }
-
-                       disasm_print_insn(buf, *member_len, opcodes, name);
-               } else {
-                       kernel_syms_load(&dd);
-                       if (json_output)
-                               dump_xlated_json(&dd, buf, *member_len, opcodes);
-                       else
-                               dump_xlated_plain(&dd, buf, *member_len, opcodes);
-                       kernel_syms_destroy(&dd);
+       } else if (member_len == &info.jited_prog_len) {
+               const char *name = NULL;
+
+               if (info.ifindex) {
+                       name = ifindex_to_bfd_name_ns(info.ifindex,
+                                                     info.netns_dev,
+                                                     info.netns_ino);
+                       if (!name)
+                               goto err_free;
                }
+
+               disasm_print_insn(buf, *member_len, opcodes, name);
+       } else {
+               kernel_syms_load(&dd);
+               if (json_output)
+                       dump_xlated_json(&dd, buf, *member_len, opcodes);
+               else
+                       dump_xlated_plain(&dd, buf, *member_len, opcodes);
+               kernel_syms_destroy(&dd);
        }
 
        free(buf);