netfilter: nf_conntrack_h323: Correct indentation when H323_TRACE defined

The trace lines are indented using PRINT("%*.s", xx, " ").
Userspace will treat this as "%*.0s" and will output no characters
when 'xx' is zero, the kernel treats it as "%*s" and will output
a single ' ' - which is probably what is intended.

Change all the formats to "%*s" removing the default precision.
This gives a single space indent when level is zero.

Signed-off-by: David Laight <david.laight.linux@gmail.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c
index 09e0f724644f3e1e7d84eeee24ef2bd04fc209b3..6830c9da3507cd037fd16c6a0cc728e1bd3d8d55 100644 (file)
--- a/net/netfilter/nf_conntrack_h323_asn1.c
+++ b/net/netfilter/nf_conntrack_h323_asn1.c
@@ -274,7 +274,7 @@ static unsigned int get_uint(struct bitstr *bs, int b)
 static int decode_nul(struct bitstr *bs, const struct field_t *f,
                       char *base, int level)
 {
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        return H323_ERROR_NONE;
 }
@@ -282,7 +282,7 @@ static int decode_nul(struct bitstr *bs, const struct field_t *f,
 static int decode_bool(struct bitstr *bs, const struct field_t *f,
                        char *base, int level)
 {
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        INC_BIT(bs);
        if (nf_h323_error_boundary(bs, 0, 0))
@@ -295,7 +295,7 @@ static int decode_oid(struct bitstr *bs, const struct field_t *f,
 {
        int len;
 
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        BYTE_ALIGN(bs);
        if (nf_h323_error_boundary(bs, 1, 0))
@@ -314,7 +314,7 @@ static int decode_int(struct bitstr *bs, const struct field_t *f,
 {
        unsigned int len;
 
-       PRINT("%*.s%s", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s", level * TAB_SIZE, " ", f->name);
 
        switch (f->sz) {
        case BYTE:              /* Range == 256 */
@@ -361,7 +361,7 @@ static int decode_int(struct bitstr *bs, const struct field_t *f,
 static int decode_enum(struct bitstr *bs, const struct field_t *f,
                        char *base, int level)
 {
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        if ((f->attr & EXT) && get_bit(bs)) {
                INC_BITS(bs, 7);
@@ -379,7 +379,7 @@ static int decode_bitstr(struct bitstr *bs, const struct field_t *f,
 {
        unsigned int len;
 
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        BYTE_ALIGN(bs);
        switch (f->sz) {
@@ -415,7 +415,7 @@ static int decode_numstr(struct bitstr *bs, const struct field_t *f,
 {
        unsigned int len;
 
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        /* 2 <= Range <= 255 */
        if (nf_h323_error_boundary(bs, 0, f->sz))
@@ -435,7 +435,7 @@ static int decode_octstr(struct bitstr *bs, const struct field_t *f,
 {
        unsigned int len;
 
-       PRINT("%*.s%s", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s", level * TAB_SIZE, " ", f->name);
 
        switch (f->sz) {
        case FIXD:              /* Range == 1 */
@@ -483,7 +483,7 @@ static int decode_bmpstr(struct bitstr *bs, const struct field_t *f,
 {
        unsigned int len;
 
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        switch (f->sz) {
        case BYTE:              /* Range == 256 */
@@ -515,7 +515,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,
        const struct field_t *son;
        unsigned char *beg = NULL;
 
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        /* Decode? */
        base = (base && (f->attr & DECODE)) ? base + f->offset : NULL;
@@ -537,7 +537,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,
        /* Decode the root components */
        for (i = opt = 0, son = f->fields; i < f->lb; i++, son++) {
                if (son->attr & STOP) {
-                       PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
+                       PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ",
                              son->name);
                        return H323_ERROR_STOP;
                }
@@ -555,7 +555,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,
                        if (nf_h323_error_boundary(bs, len, 0))
                                return H323_ERROR_BOUND;
                        if (!base || !(son->attr & DECODE)) {
-                               PRINT("%*.s%s\n", (level + 1) * TAB_SIZE,
+                               PRINT("%*s%s\n", (level + 1) * TAB_SIZE,
                                      " ", son->name);
                                bs->cur += len;
                                continue;
@@ -608,7 +608,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,
                }
 
                if (son->attr & STOP) {
-                       PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
+                       PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ",
                              son->name);
                        return H323_ERROR_STOP;
                }
@@ -622,7 +622,7 @@ static int decode_seq(struct bitstr *bs, const struct field_t *f,
                if (nf_h323_error_boundary(bs, len, 0))
                        return H323_ERROR_BOUND;
                if (!base || !(son->attr & DECODE)) {
-                       PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
+                       PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ",
                              son->name);
                        bs->cur += len;
                        continue;
@@ -648,7 +648,7 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f,
        const struct field_t *son;
        unsigned char *beg = NULL;
 
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        /* Decode? */
        base = (base && (f->attr & DECODE)) ? base + f->offset : NULL;
@@ -703,7 +703,7 @@ static int decode_seqof(struct bitstr *bs, const struct field_t *f,
                        if (nf_h323_error_boundary(bs, len, 0))
                                return H323_ERROR_BOUND;
                        if (!base || !(son->attr & DECODE)) {
-                               PRINT("%*.s%s\n", (level + 1) * TAB_SIZE,
+                               PRINT("%*s%s\n", (level + 1) * TAB_SIZE,
                                      " ", son->name);
                                bs->cur += len;
                                continue;
@@ -744,7 +744,7 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f,
        const struct field_t *son;
        unsigned char *beg = NULL;
 
-       PRINT("%*.s%s\n", level * TAB_SIZE, " ", f->name);
+       PRINT("%*s%s\n", level * TAB_SIZE, " ", f->name);
 
        /* Decode? */
        base = (base && (f->attr & DECODE)) ? base + f->offset : NULL;
@@ -785,7 +785,7 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f,
        /* Transfer to son level */
        son = &f->fields[type];
        if (son->attr & STOP) {
-               PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ", son->name);
+               PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ", son->name);
                return H323_ERROR_STOP;
        }
 
@@ -797,7 +797,7 @@ static int decode_choice(struct bitstr *bs, const struct field_t *f,
                if (nf_h323_error_boundary(bs, len, 0))
                        return H323_ERROR_BOUND;
                if (!base || !(son->attr & DECODE)) {
-                       PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
+                       PRINT("%*s%s\n", (level + 1) * TAB_SIZE, " ",
                              son->name);
                        bs->cur += len;
                        return H323_ERROR_NONE;