From f97536dcd310a1a15426dcd411d55367019879fc Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 16 Oct 2015 08:21:48 +0200
Subject: basdefs.h: Add and use RTEMS_UNUSED

---
 cpukit/libmisc/shell/cmds.c             | 2 +-
 cpukit/libmisc/shell/err.h              | 1 +
 cpukit/libmisc/shell/extern-cp.h        | 1 +
 cpukit/libmisc/shell/extern-ls.h        | 1 +
 cpukit/libmisc/shell/hexdump-odsyntax.c | 2 +-
 cpukit/libmisc/shell/main_dd.c          | 2 +-
 cpukit/libmisc/shell/main_halt.c        | 4 ++--
 cpukit/libmisc/shell/main_id.c          | 4 ++--
 cpukit/libmisc/shell/main_logoff.c      | 4 ++--
 cpukit/libmisc/shell/main_mount_nfs.c   | 4 ++--
 cpukit/libmisc/shell/main_pwd.c         | 4 ++--
 cpukit/libmisc/shell/main_stackuse.c    | 4 ++--
 cpukit/libmisc/shell/main_tty.c         | 4 ++--
 cpukit/libmisc/shell/main_whoami.c      | 4 ++--
 cpukit/libmisc/shell/main_wkspaceinfo.c | 4 ++--
 cpukit/libmisc/shell/shell_script.c     | 2 +-
 cpukit/libmisc/shell/utils-cp.c         | 6 +++---
 cpukit/libmisc/shell/utils-ls.c         | 2 +-
 cpukit/libmisc/shell/verr.c             | 2 +-
 cpukit/libmisc/shell/verrx.c            | 2 +-
 20 files changed, 31 insertions(+), 28 deletions(-)

(limited to 'cpukit/libmisc/shell')

diff --git a/cpukit/libmisc/shell/cmds.c b/cpukit/libmisc/shell/cmds.c
index 6e3e0c1ec2..dbc63639eb 100644
--- a/cpukit/libmisc/shell/cmds.c
+++ b/cpukit/libmisc/shell/cmds.c
@@ -45,7 +45,7 @@ int rtems_shell_main_monitor(int argc, char **argv) {
   return 0;
 }
 
-static bool rtems_shell_register_command(const rtems_monitor_command_entry_t *e, void *arg __attribute__((unused)))
+static bool rtems_shell_register_command(const rtems_monitor_command_entry_t *e, void *arg RTEMS_UNUSED)
 {
   /* Exclude EXIT (alias quit)*/
   if (strcmp("exit", e->command) != 0) {
diff --git a/cpukit/libmisc/shell/err.h b/cpukit/libmisc/shell/err.h
index f028d3b151..6e64e8d5e8 100644
--- a/cpukit/libmisc/shell/err.h
+++ b/cpukit/libmisc/shell/err.h
@@ -59,6 +59,7 @@
 #define vwarnx rtems_shell_vwarnx
 
 #include <setjmp.h>
+#include <rtems.h>
 
 extern  jmp_buf rtems_shell_bsd_exit_recover;
 
diff --git a/cpukit/libmisc/shell/extern-cp.h b/cpukit/libmisc/shell/extern-cp.h
index 093b30ff10..7c5ca302ef 100644
--- a/cpukit/libmisc/shell/extern-cp.h
+++ b/cpukit/libmisc/shell/extern-cp.h
@@ -43,6 +43,7 @@ typedef struct {
 } PATH_T;
 
 #include <setjmp.h>
+#include <rtems.h>
 
 typedef struct {
   PATH_T to;
diff --git a/cpukit/libmisc/shell/extern-ls.h b/cpukit/libmisc/shell/extern-ls.h
index 33f713b66e..99ac3ac328 100644
--- a/cpukit/libmisc/shell/extern-ls.h
+++ b/cpukit/libmisc/shell/extern-ls.h
@@ -41,6 +41,7 @@
 
 #include <sys/cdefs.h>
 #include <setjmp.h>
+#include <rtems.h>
 
 #define major(d) rtems_filesystem_dev_major_t(d)
 #define minor(d) rtems_filesystem_dev_minor_t(d)
diff --git a/cpukit/libmisc/shell/hexdump-odsyntax.c b/cpukit/libmisc/shell/hexdump-odsyntax.c
index 18fd223f0a..b69bc51926 100644
--- a/cpukit/libmisc/shell/hexdump-odsyntax.c
+++ b/cpukit/libmisc/shell/hexdump-odsyntax.c
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.17 2004/07/22 13:14:42 jo
 #define PADDING	"         "
 
 #ifndef __unused
-#define __unused __attribute((__unused__))
+#define __unused RTEMS_UNUSED
 #endif
 
 #if RTEMS_REMOVED
diff --git a/cpukit/libmisc/shell/main_dd.c b/cpukit/libmisc/shell/main_dd.c
index 72f9c609ff..e9c8bf386d 100644
--- a/cpukit/libmisc/shell/main_dd.c
+++ b/cpukit/libmisc/shell/main_dd.c
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $");
 #include "extern-dd.h"
 
 #ifndef __unused
-#define __unused __attribute((__unused__))
+#define __unused RTEMS_UNUSED
 #endif
 
 #define DD_DEFFILEMODE 0
diff --git a/cpukit/libmisc/shell/main_halt.c b/cpukit/libmisc/shell/main_halt.c
index a7a7d2dc40..f0a216b377 100644
--- a/cpukit/libmisc/shell/main_halt.c
+++ b/cpukit/libmisc/shell/main_halt.c
@@ -20,8 +20,8 @@
 #include "internal.h"
 
 static int rtems_shell_main_shutdown(
-  int   argc __attribute__((unused)),
-  char *argv[] __attribute__((unused))
+  int   argc RTEMS_UNUSED,
+  char *argv[] RTEMS_UNUSED
 )
 {
   fprintf(stdout, "System shutting down at user request\n");
diff --git a/cpukit/libmisc/shell/main_id.c b/cpukit/libmisc/shell/main_id.c
index 19f79cc0dc..2d2b05fe11 100644
--- a/cpukit/libmisc/shell/main_id.c
+++ b/cpukit/libmisc/shell/main_id.c
@@ -27,8 +27,8 @@
 #include "internal.h"
 
 static int rtems_shell_main_id(
-  int   argc __attribute__((unused)),
-  char *argv[] __attribute__((unused))
+  int   argc RTEMS_UNUSED,
+  char *argv[] RTEMS_UNUSED
 )
 {
   struct passwd *pwd;
diff --git a/cpukit/libmisc/shell/main_logoff.c b/cpukit/libmisc/shell/main_logoff.c
index e902744b6d..67a2967228 100644
--- a/cpukit/libmisc/shell/main_logoff.c
+++ b/cpukit/libmisc/shell/main_logoff.c
@@ -21,8 +21,8 @@
 #include "internal.h"
 
 static int rtems_shell_main_logoff(
-  int   argc __attribute__((unused)),
-  char *argv[] __attribute__((unused))
+  int   argc RTEMS_UNUSED,
+  char *argv[] RTEMS_UNUSED
 )
 {
   rtems_shell_env_t *env = rtems_shell_get_current_env();
diff --git a/cpukit/libmisc/shell/main_mount_nfs.c b/cpukit/libmisc/shell/main_mount_nfs.c
index 1784f4839f..8a2aaa4b29 100644
--- a/cpukit/libmisc/shell/main_mount_nfs.c
+++ b/cpukit/libmisc/shell/main_mount_nfs.c
@@ -29,8 +29,8 @@ static int
 rtems_shell_nfs_mounter (
   const char*                device,
   const char*                mntpoint,
-  rtems_shell_filesystems_t* fs __attribute__((unused)),
-  rtems_filesystem_options_t options __attribute__((unused)))
+  rtems_shell_filesystems_t* fs RTEMS_UNUSED,
+  rtems_filesystem_options_t options RTEMS_UNUSED)
 {
   char* uidhost;
   char* path;
diff --git a/cpukit/libmisc/shell/main_pwd.c b/cpukit/libmisc/shell/main_pwd.c
index 1c0a0770a6..ea657dc848 100644
--- a/cpukit/libmisc/shell/main_pwd.c
+++ b/cpukit/libmisc/shell/main_pwd.c
@@ -22,8 +22,8 @@
 #include "internal.h"
 
 static int rtems_shell_main_pwd(
-  int   argc __attribute__((unused)),
-  char *argv[] __attribute__((unused))
+  int   argc RTEMS_UNUSED,
+  char *argv[] RTEMS_UNUSED
 )
 {
   char dir[1024];
diff --git a/cpukit/libmisc/shell/main_stackuse.c b/cpukit/libmisc/shell/main_stackuse.c
index 51045cac5b..74d47e16b0 100644
--- a/cpukit/libmisc/shell/main_stackuse.c
+++ b/cpukit/libmisc/shell/main_stackuse.c
@@ -21,8 +21,8 @@
 #include "internal.h"
 
 static int rtems_shell_main_stackuse(
-  int   argc __attribute__((unused)),
-  char *argv[] __attribute__((unused))
+  int   argc RTEMS_UNUSED,
+  char *argv[] RTEMS_UNUSED
 )
 {
   rtems_stack_checker_report_usage_with_plugin(
diff --git a/cpukit/libmisc/shell/main_tty.c b/cpukit/libmisc/shell/main_tty.c
index 0c24862710..29dc673dbb 100644
--- a/cpukit/libmisc/shell/main_tty.c
+++ b/cpukit/libmisc/shell/main_tty.c
@@ -24,8 +24,8 @@
 #include "internal.h"
 
 static int rtems_shell_main_tty(
-  int   argc __attribute__((unused)),
-  char *argv[] __attribute__((unused))
+  int   argc RTEMS_UNUSED,
+  char *argv[] RTEMS_UNUSED
 )
 {
   printf("%s\n", ttyname(fileno(stdin)));
diff --git a/cpukit/libmisc/shell/main_whoami.c b/cpukit/libmisc/shell/main_whoami.c
index a0222b14da..8771c66c50 100644
--- a/cpukit/libmisc/shell/main_whoami.c
+++ b/cpukit/libmisc/shell/main_whoami.c
@@ -25,8 +25,8 @@
 #include "internal.h"
 
 static int rtems_shell_main_whoami(
-  int   argc __attribute__((unused)),
-  char *argv[] __attribute__((unused))
+  int   argc RTEMS_UNUSED,
+  char *argv[] RTEMS_UNUSED
 )
 {
   struct passwd *pwd;
diff --git a/cpukit/libmisc/shell/main_wkspaceinfo.c b/cpukit/libmisc/shell/main_wkspaceinfo.c
index a9906524db..6abebf0011 100644
--- a/cpukit/libmisc/shell/main_wkspaceinfo.c
+++ b/cpukit/libmisc/shell/main_wkspaceinfo.c
@@ -30,8 +30,8 @@ void rtems_shell_print_unified_work_area_message(void)
 }
 
 static int rtems_shell_main_wkspace_info(
-  int   argc __attribute__((unused)),
-  char *argv[] __attribute__((unused))
+  int   argc RTEMS_UNUSED,
+  char *argv[] RTEMS_UNUSED
 )
 {
   Heap_Information_block info;
diff --git a/cpukit/libmisc/shell/shell_script.c b/cpukit/libmisc/shell/shell_script.c
index b46e124916..2df4679481 100644
--- a/cpukit/libmisc/shell/shell_script.c
+++ b/cpukit/libmisc/shell/shell_script.c
@@ -237,7 +237,7 @@ rtems_shell_cmd_t rtems_shell_JOEL_Command = {
  *  appears to be a shell script.
  */
 int rtems_shell_script_file(
-  int   argc __attribute__((unused)),
+  int   argc RTEMS_UNUSED,
   char *argv[]
 )
 {
diff --git a/cpukit/libmisc/shell/utils-cp.c b/cpukit/libmisc/shell/utils-cp.c
index 4eab78e262..3a959d5136 100644
--- a/cpukit/libmisc/shell/utils-cp.c
+++ b/cpukit/libmisc/shell/utils-cp.c
@@ -85,7 +85,7 @@ set_utimes(const char *file, struct stat *fs)
 }
 
 int
-copy_file(rtems_shell_cp_globals* cp_globals __attribute__((unused)), FTSENT *entp, int dne)
+copy_file(rtems_shell_cp_globals* cp_globals RTEMS_UNUSED, FTSENT *entp, int dne)
 {
 #define MAX_READ max_read
   int max_read;
@@ -415,7 +415,7 @@ setfile(rtems_shell_cp_globals* cp_globals, struct stat *fs, int fd)
 }
 
 int
-preserve_fd_acls(int source_fd __attribute__((unused)), int dest_fd __attribute__((unused)))
+preserve_fd_acls(int source_fd RTEMS_UNUSED, int dest_fd RTEMS_UNUSED)
 {
 #if 0
 	struct acl *aclp;
@@ -441,7 +441,7 @@ preserve_fd_acls(int source_fd __attribute__((unused)), int dest_fd __attribute_
 }
 
 int
-preserve_dir_acls(struct stat *fs __attribute__((unused)), char *source_dir __attribute__((unused)), char *dest_dir __attribute__((unused)))
+preserve_dir_acls(struct stat *fs RTEMS_UNUSED, char *source_dir RTEMS_UNUSED, char *dest_dir RTEMS_UNUSED)
 {
 #if 0
 	acl_t (*aclgetf)(const char *, acl_type_t);
diff --git a/cpukit/libmisc/shell/utils-ls.c b/cpukit/libmisc/shell/utils-ls.c
index 7ff0d1b4bd..c476d0a213 100644
--- a/cpukit/libmisc/shell/utils-ls.c
+++ b/cpukit/libmisc/shell/utils-ls.c
@@ -92,7 +92,7 @@ safe_print(rtems_shell_ls_globals* globals, const char *src)
 }
 
 int
-printescaped(rtems_shell_ls_globals* globals __attribute__((unused)), const char *src)
+printescaped(rtems_shell_ls_globals* globals RTEMS_UNUSED, const char *src)
 {
 	unsigned char c;
 	int n;
diff --git a/cpukit/libmisc/shell/verr.c b/cpukit/libmisc/shell/verr.c
index 301e229a1c..9cb5d0cc70 100644
--- a/cpukit/libmisc/shell/verr.c
+++ b/cpukit/libmisc/shell/verr.c
@@ -58,7 +58,7 @@ __weak_alias(verr, _verr)
 #endif
 
 __dead void
-verr(jmp_buf* exit_jmp, int eval __attribute__((unused)), const char *fmt, _BSD_VA_LIST_ ap)
+verr(jmp_buf* exit_jmp, int eval RTEMS_UNUSED, const char *fmt, _BSD_VA_LIST_ ap)
 {
 	int sverrno;
 
diff --git a/cpukit/libmisc/shell/verrx.c b/cpukit/libmisc/shell/verrx.c
index 30355dd31c..468500d000 100644
--- a/cpukit/libmisc/shell/verrx.c
+++ b/cpukit/libmisc/shell/verrx.c
@@ -56,7 +56,7 @@ __weak_alias(verrx, _verrx)
 #endif
 
 __dead void
-verrx(jmp_buf* exit_jmp, int eval __attribute__((unused)), const char *fmt, _BSD_VA_LIST_ ap)
+verrx(jmp_buf* exit_jmp, int eval RTEMS_UNUSED, const char *fmt, _BSD_VA_LIST_ ap)
 {
 #if 0
 	(void)fprintf(stderr, "%s: ", getprogname());
-- 
cgit v1.2.3