From f97536dcd310a1a15426dcd411d55367019879fc Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 16 Oct 2015 08:21:48 +0200 Subject: basdefs.h: Add and use RTEMS_UNUSED --- cpukit/libmisc/capture/capture-cli.c | 2 +- cpukit/libmisc/capture/capture.c | 2 +- cpukit/libmisc/devnull/devnull.c | 32 ++++++++++++++++---------------- cpukit/libmisc/devnull/devzero.c | 32 ++++++++++++++++---------------- cpukit/libmisc/fb/mw_uid.c | 2 +- cpukit/libmisc/monitor/mon-command.c | 2 +- cpukit/libmisc/monitor/mon-config.c | 8 ++++---- cpukit/libmisc/monitor/mon-driver.c | 4 ++-- cpukit/libmisc/monitor/mon-extension.c | 2 +- cpukit/libmisc/monitor/mon-itask.c | 4 ++-- cpukit/libmisc/monitor/mon-monitor.c | 26 +++++++++++++------------- cpukit/libmisc/monitor/mon-network.c | 8 ++++---- cpukit/libmisc/monitor/mon-part.c | 4 ++-- cpukit/libmisc/monitor/mon-queue.c | 4 ++-- cpukit/libmisc/monitor/mon-region.c | 4 ++-- cpukit/libmisc/monitor/mon-sema.c | 4 ++-- cpukit/libmisc/monitor/mon-server.c | 4 ++-- cpukit/libmisc/monitor/mon-symbols.c | 4 ++-- cpukit/libmisc/monitor/mon-task.c | 4 ++-- cpukit/libmisc/serdbg/termios_printk.c | 2 +- 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 +- cpukit/libmisc/stackchk/check.c | 6 +++--- 41 files changed, 111 insertions(+), 108 deletions(-) (limited to 'cpukit/libmisc') diff --git a/cpukit/libmisc/capture/capture-cli.c b/cpukit/libmisc/capture/capture-cli.c index 1a499b4ca9..b9c2edcd75 100644 --- a/cpukit/libmisc/capture/capture-cli.c +++ b/cpukit/libmisc/capture/capture-cli.c @@ -37,7 +37,7 @@ #include #include # -#define RC_UNUSED __attribute__((unused)) +#define RC_UNUSED RTEMS_UNUSED #define RTEMS_CAPTURE_CLI_MAX_LOAD_TASKS (20) diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c index c1c1f84435..93f2546a3d 100644 --- a/cpukit/libmisc/capture/capture.c +++ b/cpukit/libmisc/capture/capture.c @@ -563,7 +563,7 @@ rtems_capture_trigger (rtems_tcb* ft, * buffer. It is assumed we have a working heap at stage of initialization. */ rtems_status_code -rtems_capture_open (uint32_t size, rtems_capture_timestamp timestamp __attribute__((unused))) +rtems_capture_open (uint32_t size, rtems_capture_timestamp timestamp RTEMS_UNUSED) { rtems_status_code sc = RTEMS_SUCCESSFUL; size_t count; diff --git a/cpukit/libmisc/devnull/devnull.c b/cpukit/libmisc/devnull/devnull.c index 4aed5eb0f3..6ec70e85a4 100644 --- a/cpukit/libmisc/devnull/devnull.c +++ b/cpukit/libmisc/devnull/devnull.c @@ -44,8 +44,8 @@ static char initialized; rtems_device_driver null_initialize( rtems_device_major_number major, - rtems_device_minor_number minor __attribute__((unused)), - void *pargp __attribute__((unused)) + rtems_device_minor_number minor RTEMS_UNUSED, + void *pargp RTEMS_UNUSED ) { rtems_device_driver status; @@ -82,9 +82,9 @@ rtems_device_driver null_initialize( */ rtems_device_driver null_open( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), - void *pargp __attribute__((unused)) + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, + void *pargp RTEMS_UNUSED ) { return NULL_SUCCESSFUL; @@ -105,9 +105,9 @@ rtems_device_driver null_open( */ rtems_device_driver null_close( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), - void *pargp __attribute__((unused)) + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, + void *pargp RTEMS_UNUSED ) { return NULL_SUCCESSFUL; @@ -128,9 +128,9 @@ rtems_device_driver null_close( */ rtems_device_driver null_read( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), - void *pargp __attribute__((unused)) + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, + void *pargp RTEMS_UNUSED ) { return NULL_SUCCESSFUL; @@ -151,8 +151,8 @@ rtems_device_driver null_read( */ rtems_device_driver null_write( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, void *pargp ) { @@ -179,9 +179,9 @@ rtems_device_driver null_write( */ rtems_device_driver null_control( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), - void *pargp __attribute__((unused)) + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, + void *pargp RTEMS_UNUSED ) { return NULL_SUCCESSFUL; diff --git a/cpukit/libmisc/devnull/devzero.c b/cpukit/libmisc/devnull/devzero.c index c2f2f5f2f4..4aecec6528 100644 --- a/cpukit/libmisc/devnull/devzero.c +++ b/cpukit/libmisc/devnull/devzero.c @@ -31,35 +31,35 @@ rtems_device_driver dev_zero_initialize( rtems_device_major_number major, - rtems_device_minor_number minor __attribute__((unused)), - void *arg __attribute__((unused)) + rtems_device_minor_number minor RTEMS_UNUSED, + void *arg RTEMS_UNUSED ) { return rtems_io_register_name(DEVZERO_DEVICE_NAME, major, 0); } rtems_device_driver dev_zero_open( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), - void *arg __attribute__((unused)) + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, + void *arg RTEMS_UNUSED ) { return RTEMS_SUCCESSFUL; } rtems_device_driver dev_zero_close( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), - void *arg __attribute__((unused)) + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, + void *arg RTEMS_UNUSED ) { return RTEMS_SUCCESSFUL; } rtems_device_driver dev_zero_read( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), - void *arg __attribute__((unused)) + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, + void *arg RTEMS_UNUSED ) { rtems_libio_rw_args_t *rw = arg; @@ -71,8 +71,8 @@ rtems_device_driver dev_zero_read( } rtems_device_driver dev_zero_write( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, void *arg ) { @@ -84,9 +84,9 @@ rtems_device_driver dev_zero_write( } rtems_device_driver dev_zero_control( - rtems_device_major_number major __attribute__((unused)), - rtems_device_minor_number minor __attribute__((unused)), - void *arg __attribute__((unused)) + rtems_device_major_number major RTEMS_UNUSED, + rtems_device_minor_number minor RTEMS_UNUSED, + void *arg RTEMS_UNUSED ) { return RTEMS_IO_ERROR; diff --git a/cpukit/libmisc/fb/mw_uid.c b/cpukit/libmisc/fb/mw_uid.c index 2381089d53..db98f1fa9c 100644 --- a/cpukit/libmisc/fb/mw_uid.c +++ b/cpukit/libmisc/fb/mw_uid.c @@ -36,7 +36,7 @@ static int open_count = 0; /* open a message queue with the kernel */ int uid_open_queue( const char *q_name, - int flags __attribute__((unused)), + int flags RTEMS_UNUSED, size_t max_msgs ) { diff --git a/cpukit/libmisc/monitor/mon-command.c b/cpukit/libmisc/monitor/mon-command.c index 99fc0aea94..64b102b8f9 100644 --- a/cpukit/libmisc/monitor/mon-command.c +++ b/cpukit/libmisc/monitor/mon-command.c @@ -175,7 +175,7 @@ void rtems_monitor_help_cmd( int argc, char **argv, const rtems_monitor_command_arg_t *command_arg, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { int arg; diff --git a/cpukit/libmisc/monitor/mon-config.c b/cpukit/libmisc/monitor/mon-config.c index 00eec9b902..a6674c144a 100644 --- a/cpukit/libmisc/monitor/mon-config.c +++ b/cpukit/libmisc/monitor/mon-config.c @@ -55,8 +55,8 @@ rtems_monitor_config_canonical( const void * rtems_monitor_config_next( - void *object_info __attribute__((unused)), - rtems_monitor_config_t *canonical_config __attribute__((unused)), + void *object_info RTEMS_UNUSED, + rtems_monitor_config_t *canonical_config RTEMS_UNUSED, rtems_id *next_id ) { @@ -79,7 +79,7 @@ failed: void rtems_monitor_config_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { fprintf(stdout,"\ @@ -93,7 +93,7 @@ INITIAL (startup) Configuration Info\n"); int rtems_monitor_config_dump( rtems_monitor_config_t *monitor_config, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { int length = 0; diff --git a/cpukit/libmisc/monitor/mon-driver.c b/cpukit/libmisc/monitor/mon-driver.c index 8abe281d56..ebbf0ecbfa 100644 --- a/cpukit/libmisc/monitor/mon-driver.c +++ b/cpukit/libmisc/monitor/mon-driver.c @@ -58,7 +58,7 @@ rtems_monitor_driver_canonical( const void * rtems_monitor_driver_next( - void *object_info __attribute__((unused)), + void *object_info RTEMS_UNUSED, rtems_monitor_driver_t *canonical_driver, rtems_id *next_id ) @@ -88,7 +88,7 @@ failed: void rtems_monitor_driver_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { fprintf(stdout,"\ diff --git a/cpukit/libmisc/monitor/mon-extension.c b/cpukit/libmisc/monitor/mon-extension.c index e7e44247db..89d7170ced 100644 --- a/cpukit/libmisc/monitor/mon-extension.c +++ b/cpukit/libmisc/monitor/mon-extension.c @@ -41,7 +41,7 @@ rtems_monitor_extension_canonical( void rtems_monitor_extension_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { fprintf(stdout,"\ diff --git a/cpukit/libmisc/monitor/mon-itask.c b/cpukit/libmisc/monitor/mon-itask.c index a1cca302ff..d686b41918 100644 --- a/cpukit/libmisc/monitor/mon-itask.c +++ b/cpukit/libmisc/monitor/mon-itask.c @@ -35,7 +35,7 @@ rtems_monitor_init_task_canonical( const void * rtems_monitor_init_task_next( - void *object_info __attribute__((unused)), + void *object_info RTEMS_UNUSED, rtems_monitor_init_task_t *canonical_init_task, rtems_id *next_id ) @@ -68,7 +68,7 @@ failed: void rtems_monitor_init_task_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { fprintf(stdout,"\ diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c index 34c85fe342..fe292f29d0 100644 --- a/cpukit/libmisc/monitor/mon-monitor.c +++ b/cpukit/libmisc/monitor/mon-monitor.c @@ -297,10 +297,10 @@ rtems_monitor_wakeup(void) } void rtems_monitor_debugger_cmd( - int argc __attribute__((unused)), - char **argv __attribute__((unused)), - const rtems_monitor_command_arg_t *command_arg __attribute__((unused)), - bool verbose __attribute__((unused)) + int argc RTEMS_UNUSED, + char **argv RTEMS_UNUSED, + const rtems_monitor_command_arg_t *command_arg RTEMS_UNUSED, + bool verbose RTEMS_UNUSED ) { #ifdef CPU_INVOKE_DEBUGGER @@ -311,8 +311,8 @@ void rtems_monitor_debugger_cmd( void rtems_monitor_pause_cmd( int argc, char **argv, - const rtems_monitor_command_arg_t *command_arg __attribute__((unused)), - bool verbose __attribute__((unused)) + const rtems_monitor_command_arg_t *command_arg RTEMS_UNUSED, + bool verbose RTEMS_UNUSED ) { if (argc == 1) @@ -325,7 +325,7 @@ void rtems_monitor_fatal_cmd( int argc, char **argv, const rtems_monitor_command_arg_t *command_arg, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { if (argc == 1) @@ -335,10 +335,10 @@ void rtems_monitor_fatal_cmd( } void rtems_monitor_continue_cmd( - int argc __attribute__((unused)), - char **argv __attribute__((unused)), - const rtems_monitor_command_arg_t *command_arg __attribute__((unused)), - bool verbose __attribute__((unused)) + int argc RTEMS_UNUSED, + char **argv RTEMS_UNUSED, + const rtems_monitor_command_arg_t *command_arg RTEMS_UNUSED, + bool verbose RTEMS_UNUSED ) { rtems_monitor_suspend(RTEMS_NO_TIMEOUT); @@ -348,8 +348,8 @@ void rtems_monitor_continue_cmd( void rtems_monitor_node_cmd( int argc, char **argv, - const rtems_monitor_command_arg_t *command_arg __attribute__((unused)), - bool verbose __attribute__((unused)) + const rtems_monitor_command_arg_t *command_arg RTEMS_UNUSED, + bool verbose RTEMS_UNUSED ) { uint32_t new_node = rtems_monitor_default_node; diff --git a/cpukit/libmisc/monitor/mon-network.c b/cpukit/libmisc/monitor/mon-network.c index 6f84bdffe3..2140044abe 100644 --- a/cpukit/libmisc/monitor/mon-network.c +++ b/cpukit/libmisc/monitor/mon-network.c @@ -28,8 +28,8 @@ #include void mon_ifconfig(int argc, char *argv[], - uint32_t command_arg __attribute__((unused)), - bool verbose __attribute__((unused))) + uint32_t command_arg RTEMS_UNUSED, + bool verbose RTEMS_UNUSED) { struct sockaddr_in ipaddr; struct sockaddr_in dstaddr; @@ -233,8 +233,8 @@ void mon_ifconfig(int argc, char *argv[], void mon_route(int argc, char *argv[], - uint32_t command_arg __attribute__((unused)), - bool verbose __attribute__((unused))) + uint32_t command_arg RTEMS_UNUSED, + bool verbose RTEMS_UNUSED) { int cmd; struct sockaddr_in dst; diff --git a/cpukit/libmisc/monitor/mon-part.c b/cpukit/libmisc/monitor/mon-part.c index 84624c5e0b..713e106e58 100644 --- a/cpukit/libmisc/monitor/mon-part.c +++ b/cpukit/libmisc/monitor/mon-part.c @@ -30,7 +30,7 @@ rtems_monitor_part_canonical( void rtems_monitor_part_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { printf("\ @@ -47,7 +47,7 @@ rtems_monitor_part_dump_header( void rtems_monitor_part_dump( rtems_monitor_part_t *monitor_part, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { int length = 0; diff --git a/cpukit/libmisc/monitor/mon-queue.c b/cpukit/libmisc/monitor/mon-queue.c index 9a77d55ce5..9430797c6c 100644 --- a/cpukit/libmisc/monitor/mon-queue.c +++ b/cpukit/libmisc/monitor/mon-queue.c @@ -24,7 +24,7 @@ rtems_monitor_queue_canonical( void rtems_monitor_queue_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { fprintf(stdout,"\ @@ -44,7 +44,7 @@ rtems_monitor_queue_dump_header( void rtems_monitor_queue_dump( rtems_monitor_queue_t *monitor_queue, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { uint32_t length = 0; diff --git a/cpukit/libmisc/monitor/mon-region.c b/cpukit/libmisc/monitor/mon-region.c index f6fdd02110..289a00b32f 100644 --- a/cpukit/libmisc/monitor/mon-region.c +++ b/cpukit/libmisc/monitor/mon-region.c @@ -31,7 +31,7 @@ rtems_monitor_region_canonical( void rtems_monitor_region_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { printf("\ @@ -48,7 +48,7 @@ rtems_monitor_region_dump_header( void rtems_monitor_region_dump( rtems_monitor_region_t *monitor_region, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { int length = 0; diff --git a/cpukit/libmisc/monitor/mon-sema.c b/cpukit/libmisc/monitor/mon-sema.c index 10448663d9..f7e35edd29 100644 --- a/cpukit/libmisc/monitor/mon-sema.c +++ b/cpukit/libmisc/monitor/mon-sema.c @@ -52,7 +52,7 @@ rtems_monitor_sema_canonical( void rtems_monitor_sema_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { printf("\ @@ -69,7 +69,7 @@ rtems_monitor_sema_dump_header( void rtems_monitor_sema_dump( rtems_monitor_sema_t *monitor_sema, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { int length = 0; diff --git a/cpukit/libmisc/monitor/mon-server.c b/cpukit/libmisc/monitor/mon-server.c index 109a57715a..9949f66d63 100644 --- a/cpukit/libmisc/monitor/mon-server.c +++ b/cpukit/libmisc/monitor/mon-server.c @@ -111,7 +111,7 @@ done: void rtems_monitor_server_task( - rtems_task_argument monitor_flags __attribute__((unused)) + rtems_task_argument monitor_flags RTEMS_UNUSED ) { rtems_monitor_server_request_t request; @@ -214,7 +214,7 @@ rtems_monitor_server_kill(void) void rtems_monitor_server_init( - uint32_t monitor_flags __attribute__((unused)) + uint32_t monitor_flags RTEMS_UNUSED ) { #if defined(RTEMS_MULTIPROCESSING) diff --git a/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c index b434b1214e..57d3604deb 100644 --- a/cpukit/libmisc/monitor/mon-symbols.c +++ b/cpukit/libmisc/monitor/mon-symbols.c @@ -299,7 +299,7 @@ rtems_symbol_name_lookup( const void * rtems_monitor_symbol_next( void *object_info, - rtems_monitor_symbol_t *canonical __attribute__((unused)), + rtems_monitor_symbol_t *canonical RTEMS_UNUSED, rtems_id *next_id ) { @@ -419,7 +419,7 @@ rtems_monitor_symbol_dump( static void rtems_monitor_symbol_dump_all( rtems_symbol_table_t *table, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { uint32_t s; diff --git a/cpukit/libmisc/monitor/mon-task.c b/cpukit/libmisc/monitor/mon-task.c index 0d6555717c..910dd9db28 100644 --- a/cpukit/libmisc/monitor/mon-task.c +++ b/cpukit/libmisc/monitor/mon-task.c @@ -55,7 +55,7 @@ rtems_monitor_task_canonical( void rtems_monitor_task_dump_header( - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { fprintf(stdout,"\ @@ -71,7 +71,7 @@ ID NAME CPU PRI STATE MODES EVENTS WAITID WAITQUEUE\n"); /* void rtems_monitor_task_dump( rtems_monitor_task_t *monitor_task, - bool verbose __attribute__((unused)) + bool verbose RTEMS_UNUSED ) { int length = 0; diff --git a/cpukit/libmisc/serdbg/termios_printk.c b/cpukit/libmisc/serdbg/termios_printk.c index 082f45bbcb..01ed334563 100644 --- a/cpukit/libmisc/serdbg/termios_printk.c +++ b/cpukit/libmisc/serdbg/termios_printk.c @@ -43,7 +43,7 @@ int termios_printk_fd = -1; struct rtems_termios_tty *termios_printk_tty; static void _termios_printk_null_char( - char c __attribute__((unused))) + char c RTEMS_UNUSED) { return; } 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 +#include 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 +#include 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 #include +#include #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()); diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c index a44279864a..9c6932e290 100644 --- a/cpukit/libmisc/stackchk/check.c +++ b/cpukit/libmisc/stackchk/check.c @@ -182,7 +182,7 @@ static void Stack_check_Initialize( void ) * rtems_stack_checker_create_extension */ bool rtems_stack_checker_create_extension( - Thread_Control *running __attribute__((unused)), + Thread_Control *running RTEMS_UNUSED, Thread_Control *the_thread ) { @@ -276,8 +276,8 @@ void Stack_check_report_blown_task(Thread_Control *running, bool pattern_ok) * rtems_stack_checker_switch_extension */ void rtems_stack_checker_switch_extension( - Thread_Control *running __attribute__((unused)), - Thread_Control *heir __attribute__((unused)) + Thread_Control *running RTEMS_UNUSED, + Thread_Control *heir RTEMS_UNUSED ) { Stack_Control *the_stack = &running->Start.Initial_stack; -- cgit v1.2.3