From ab1878245ca6d53e5f9477904b660295ae7de8dd Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 26 Oct 2005 10:47:26 +0000 Subject: * uniq.c: remove unneeded include and use short boilerplate. * coreutils.h: remove prototype of non-existing xgetoptfile_sort_uniq and add boilerplate. * networking/{ipaddr,ip,iplink,iproute,iptunnel}.c: touch includes and use short boilerplate. * libiproute/iproute.c: rename round to avoid clashes with older SuSE gcc and use short boilerplate. --- networking/ip.c | 9 +++------ networking/ipaddr.c | 9 +++------ networking/iplink.c | 9 +++------ networking/iproute.c | 9 +++------ networking/iptunnel.c | 9 +++------ networking/libiproute/iproute.c | 11 ++++------- 6 files changed, 19 insertions(+), 37 deletions(-) (limited to 'networking') diff --git a/networking/ip.c b/networking/ip.c index cfdbf8b..9250484 100644 --- a/networking/ip.c +++ b/networking/ip.c @@ -1,10 +1,7 @@ /* * ip.c "ip" utility frontend. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * Authors: Alexey Kuznetsov, * @@ -23,8 +20,8 @@ #include #include -#include "./libiproute/utils.h" -#include "./libiproute/ip_common.h" +#include "libiproute/utils.h" +#include "libiproute/ip_common.h" #include "busybox.h" diff --git a/networking/ipaddr.c b/networking/ipaddr.c index 7826194..4317557 100644 --- a/networking/ipaddr.c +++ b/networking/ipaddr.c @@ -1,10 +1,7 @@ /* * ip.c "ip" utility frontend. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * Authors: Alexey Kuznetsov, * @@ -14,8 +11,8 @@ * Rani Assaf 980929: resolve addresses */ -#include "./libiproute/utils.h" -#include "./libiproute/ip_common.h" +#include "libiproute/utils.h" +#include "libiproute/ip_common.h" #include "busybox.h" diff --git a/networking/iplink.c b/networking/iplink.c index 7207e17..2f13aff 100644 --- a/networking/iplink.c +++ b/networking/iplink.c @@ -1,10 +1,7 @@ /* * ip.c "ip" utility frontend. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * Authors: Alexey Kuznetsov, * @@ -14,8 +11,8 @@ * Rani Assaf 980929: resolve addresses */ -#include "./libiproute/utils.h" -#include "./libiproute/ip_common.h" +#include "libiproute/utils.h" +#include "libiproute/ip_common.h" #include "busybox.h" diff --git a/networking/iproute.c b/networking/iproute.c index d049a87..ce58d62 100644 --- a/networking/iproute.c +++ b/networking/iproute.c @@ -1,10 +1,7 @@ /* * ip.c "ip" utility frontend. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * Authors: Alexey Kuznetsov, * @@ -14,8 +11,8 @@ * Rani Assaf 980929: resolve addresses */ -#include "./libiproute/utils.h" -#include "./libiproute/ip_common.h" +#include "libiproute/utils.h" +#include "libiproute/ip_common.h" #include "busybox.h" diff --git a/networking/iptunnel.c b/networking/iptunnel.c index f2b2e8a..feff1fc 100644 --- a/networking/iptunnel.c +++ b/networking/iptunnel.c @@ -1,10 +1,7 @@ /* * ip.c "ip" utility frontend. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * Authors: Alexey Kuznetsov, * @@ -14,8 +11,8 @@ * Rani Assaf 980929: resolve addresses */ -#include "./libiproute/utils.h" -#include "./libiproute/ip_common.h" +#include "libiproute/utils.h" +#include "libiproute/ip_common.h" #include "busybox.h" diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index fabab5b..cc229c2 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -1,10 +1,7 @@ /* * iproute.c "ip route". * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. * * Authors: Alexey Kuznetsov, * @@ -588,7 +585,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) } if (flush) { - int round = 0; + int _round = 0; char flushb[4096-512]; if (filter.tb == -1) { @@ -614,14 +611,14 @@ static int iproute_list_or_flush(int argc, char **argv, int flush) return -1; } if (filter.flushed == 0) { - if (round == 0) { + if (_round == 0) { if (filter.tb != -1 || do_ipv6 == AF_INET6) fprintf(stderr, "Nothing to flush.\n"); } fflush(stdout); return 0; } - round++; + _round++; if (flush_update() < 0) exit(1); } -- cgit v1.1