]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
src: simplify classid printing using %x instead of %04x
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 22 Jul 2016 14:45:57 +0000 (16:45 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 18 Aug 2016 01:14:58 +0000 (03:14 +0200)
No need to print this in iptables CLASSIFY target format,
eg. 0004:1230, this is innecessarily large.

And always print major and minor numbers.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/meta.c

index c7967b05b9a75bbc036f225862c5823b550865c8..1b17819798c1aa1b0ce1f9f354b9cbd9111e3a69 100644 (file)
@@ -80,14 +80,7 @@ static void tchandle_type_print(const struct expr *expr)
                printf("none");
                break;
        default:
-               if (TC_H_MAJ(handle) == 0)
-                       printf(":%04x", TC_H_MIN(handle));
-               else if (TC_H_MIN(handle) == 0)
-                       printf("%04x:", TC_H_MAJ(handle) >> 16);
-               else {
-                       printf("%04x:%04x",
-                              TC_H_MAJ(handle) >> 16, TC_H_MIN(handle));
-               }
+               printf("%0x:%0x", TC_H_MAJ(handle) >> 16, TC_H_MIN(handle));
                break;
        }
 }