[B.A.T.M.A.N.] [PATCH] batman-adv: Remove footer from originators list

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove footer from originators list

[Moritz Warning]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This patch would make the output consistent with the "batctl tg" output
by sending no output if there is no entry to be displayed.

The intention is to make it easier to parse the output using console facilities.
Of course you could use grep -v "^No" to filter out this line,
but that would be ugly and somewhat harsh for low performance machines such as routers
and big tables (I haven't done benchmarks in this regard).
This also helps the intention of the -H patch (https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2012-October/008143.html).

Relevant ticket: http://www.open-mesh.org/issues/165

Signed-off-by: Moritz Warning <moritzwarning at web.de>
diff --git a/originator.c b/originator.c
index 8c32cf1..d559a77 100644
- --- a/originator.c
+++ b/originator.c
@@ -467,9 +467,6 @@ next:
                rcu_read_unlock();
        }
 
- -       if (batman_count == 0)
- -               seq_printf(seq, "No batman nodes in range ...\n");
- -
 out:
        if (primary_if)
                batadv_hardif_free_ref(primary_if);
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJQfVaIAAoJECHrh56PP4wpuzQH/ib2VlbQ1ulVsvNMoZ3Vltxp
F+CXAPLymPrWPu30+vzFN2FauEtjT8K3WY4J0JgnlZqt1D9163kxvEnaCXTMRPsV
B1YT5dnPIyKMdJfX/XULdSJtxAy1PCL4HqbJvRm+QhqXnDisUMMjfL3rX9tCyAb0
ctQt+VxVhodNbznTAbol2jeEnnNsZOvyoSQ/0x850grnx0kRRLWy9y2xsrBxuhtn
hyEBepOTx84z2bw1IIQJgOiafNVz+NtvMWKBnhZgkIsJbZac8g0IWY18uW0icqWC
JyuYQHlsuYO3v9pez4MLkO6DWlez1+3tKiTs/Yj5qS1cAmEfrrUGHV9ouetF80Q=
=MoTM
-----END PGP SIGNATURE-----

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: Remove footer from originators list

[Sven Eckelmann]

[-- Attachment #1: Type: text/plain, Size: 2030 bytes --]

On Tuesday 16 October 2012 14:43:52 Moritz Warning wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> This patch would make the output consistent with the "batctl tg" output
> by sending no output if there is no entry to be displayed.
> 
> The intention is to make it easier to parse the output using console
> facilities. Of course you could use grep -v "^No" to filter out this line,
> but that would be ugly and somewhat harsh for low performance machines such
> as routers and big tables (I haven't done benchmarks in this regard).
> This also helps the intention of the -H patch
> (https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2012-October/008143.html
> ).
> 
> Relevant ticket: http://www.open-mesh.org/issues/165
> 
> Signed-off-by: Moritz Warning <moritzwarning at web.de>


$ git am -3 ~/\[B.A.T.M.A.N.\]\ \[PATCH\]\ batman-adv_Remove\ footer\ from\ 
originators\ list.mbox 
Applying: batman-adv: Remove footer from originators list
fatal: patch fragment without header at line 5: @@ -467,9 +467,6 @@ next:
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 batman-adv: Remove footer from originators list
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
$ patch -p1 -i ~/\[B.A.T.M.A.N.\]\ \[PATCH\]\ batman-adv_Remove\ footer\ from\ 
originators\ list.mbox 
patching file originator.c
Reversed (or previously applied) patch detected!  Assume -R? [n] n
Apply anyway? [n] y
Hunk #1 FAILED at 467.
1 out of 1 hunk FAILED -- saving rejects to file originator.c.rej

Please read

http://www.open-mesh.org/projects/open-mesh/wiki/Contribute#Submitting-patches

Also make your patch more clean by also removing the batman_count variable... 
And don't write things like "This patch would....". Relevant documentation can 
also be found in Documentation/SubmittingPatches

Kind regards,
	Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]