From 20f40000864609866b51624351581d067b18469c Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 30 Jan 2006 17:17:14 +0000 Subject: - add some ATTRIBUTE_UNUSED. - use shorter boilerplate while at it. --- coreutils/chmod.c | 17 ++--------------- coreutils/chown.c | 3 ++- coreutils/false.c | 17 ++--------------- coreutils/hostid.c | 17 ++--------------- coreutils/logname.c | 17 ++--------------- 5 files changed, 10 insertions(+), 61 deletions(-) (limited to 'coreutils') diff --git a/coreutils/chmod.c b/coreutils/chmod.c index 3014d374a..b69cccdf1 100644 --- a/coreutils/chmod.c +++ b/coreutils/chmod.c @@ -7,20 +7,7 @@ * Reworked by (C) 2002 Vladimir Oleynik * to correctly parse '-rwxgoa' * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 compliant */ @@ -44,7 +31,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk) return (FALSE); } -int chmod_main(int argc, char **argv) +int chmod_main(int ATTRIBUTE_UNUSED argc, char **argv) { int retval = EXIT_SUCCESS; int recursiveFlag = FALSE; diff --git a/coreutils/chown.c b/coreutils/chown.c index 888c3fc89..660d08947 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c @@ -22,7 +22,8 @@ static gid_t gid = -1; static int (*chown_func)(const char *, uid_t, gid_t) = chown; -static int fileAction(const char *fileName, struct stat *statbuf, void* junk) +static int fileAction(const char *fileName, struct stat *statbuf, + void ATTRIBUTE_UNUSED *junk) { if (!chown_func(fileName, (uid == -1) ? statbuf->st_uid : uid, diff --git a/coreutils/false.c b/coreutils/false.c index 5cf238409..b06ef8b62 100644 --- a/coreutils/false.c +++ b/coreutils/false.c @@ -4,20 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 compliant */ @@ -26,7 +13,7 @@ #include #include "busybox.h" -extern int false_main(int argc, char **argv) +extern int false_main(int ATTRIBUTE_UNUSED argc, char ATTRIBUTE_UNUSED **argv) { return EXIT_FAILURE; } diff --git a/coreutils/hostid.c b/coreutils/hostid.c index 917dc223e..0c11ca385 100644 --- a/coreutils/hostid.c +++ b/coreutils/hostid.c @@ -4,20 +4,7 @@ * * Copyright (C) 2000 Edward Betts . * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */ @@ -26,7 +13,7 @@ #include #include "busybox.h" -extern int hostid_main(int argc, char **argv) +extern int hostid_main(int argc, char ATTRIBUTE_UNUSED **argv) { if (argc > 1) { bb_show_usage(); diff --git a/coreutils/logname.c b/coreutils/logname.c index ca5eb41cf..e2a74f932 100644 --- a/coreutils/logname.c +++ b/coreutils/logname.c @@ -4,20 +4,7 @@ * * Copyright (C) 2000 Edward Betts . * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* BB_AUDIT SUSv3 compliant */ @@ -38,7 +25,7 @@ #include #include "busybox.h" -extern int logname_main(int argc, char **argv) +extern int logname_main(int argc, char ATTRIBUTE_UNUSED **argv) { const char *p; -- cgit v1.2.3