- add some ATTRIBUTE_UNUSED.

- use shorter boilerplate while at it.

2 files changed, 6 insertions, 28 deletions

diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index 42ccd66..65ddd5a 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -5,19 +5,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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.
  */
 
 #include <stdio.h>
@@ -27,11 +15,13 @@
 #include <signal.h>
 #include <termios.h>
 #include <sys/ioctl.h>
+
+#include "libbb.h"
 #define PWD_BUFFER_SIZE 256
 
 
 /* do nothing signal handler */
-static void askpass_timeout(int ignore)
+static void askpass_timeout(int ATTRIBUTE_UNUSED ignore)
 {
 }
 
diff --git a/libbb/bb_echo.c b/libbb/bb_echo.c
index 387ee96..41e6e49 100644
--- a/libbb/bb_echo.c
+++ b/libbb/bb_echo.c
@@ -5,19 +5,7 @@
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
- * 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.
  *
  * Original copyright notice is retained at the end of this file.
  */
@@ -40,7 +28,7 @@
 #include <string.h>
 #include "busybox.h"
 
-extern int bb_echo(int argc, char** argv)
+extern int bb_echo(int ATTRIBUTE_UNUSED argc, char **argv)
 {
 #ifndef CONFIG_FEATURE_FANCY_ECHO
 #define eflag '\\'