From be95da0e1960a9113b7f9607ecdb7b4a35c433ba Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 18 Sep 1996 20:55:13 +0000 Subject: casts added to numerous arguments, prototypes corrected, and proper include files added. --- c/src/lib/libmisc/monitor/mon-driver.c | 12 ++++++------ c/src/lib/libmisc/monitor/mon-extension.c | 16 ++++++++-------- c/src/lib/libmisc/monitor/mon-itask.c | 2 +- c/src/lib/libmisc/monitor/mon-manager.c | 2 +- c/src/lib/libmisc/monitor/mon-monitor.c | 1 + c/src/lib/libmisc/monitor/mon-mpci.c | 10 +++++----- c/src/lib/libmisc/monitor/mon-object.c | 2 ++ c/src/lib/libmisc/monitor/mon-server.c | 1 + c/src/lib/libmisc/monitor/mon-task.c | 1 + c/src/lib/libmisc/monitor/monitor.h | 2 +- c/src/libmisc/monitor/mon-driver.c | 12 ++++++------ c/src/libmisc/monitor/mon-extension.c | 16 ++++++++-------- c/src/libmisc/monitor/mon-itask.c | 2 +- c/src/libmisc/monitor/mon-manager.c | 2 +- c/src/libmisc/monitor/mon-monitor.c | 1 + c/src/libmisc/monitor/mon-mpci.c | 10 +++++----- c/src/libmisc/monitor/mon-object.c | 2 ++ c/src/libmisc/monitor/mon-server.c | 1 + c/src/libmisc/monitor/mon-task.c | 1 + c/src/libmisc/monitor/monitor.h | 2 +- 20 files changed, 54 insertions(+), 44 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libmisc/monitor/mon-driver.c b/c/src/lib/libmisc/monitor/mon-driver.c index d5cff24a19..065172534c 100644 --- a/c/src/lib/libmisc/monitor/mon-driver.c +++ b/c/src/lib/libmisc/monitor/mon-driver.c @@ -40,18 +40,18 @@ rtems_monitor_driver_canonical( rtems_driver_address_table *d = (rtems_driver_address_table *) driver_void; rtems_monitor_symbol_canonical_by_value(&canonical_driver->initialization, - d->initialization); + (void *) d->initialization); rtems_monitor_symbol_canonical_by_value(&canonical_driver->open, - d->open); + (void *) d->open); rtems_monitor_symbol_canonical_by_value(&canonical_driver->close, - d->close); + (void *) d->close); rtems_monitor_symbol_canonical_by_value(&canonical_driver->read, - d->read); + (void *) d->read); rtems_monitor_symbol_canonical_by_value(&canonical_driver->write, - d->write); + (void *) d->write); rtems_monitor_symbol_canonical_by_value(&canonical_driver->control, - d->control); + (void *) d->control); } diff --git a/c/src/lib/libmisc/monitor/mon-extension.c b/c/src/lib/libmisc/monitor/mon-extension.c index 4afecaa617..18f6cf2d47 100644 --- a/c/src/lib/libmisc/monitor/mon-extension.c +++ b/c/src/lib/libmisc/monitor/mon-extension.c @@ -19,22 +19,22 @@ rtems_monitor_extension_canonical( rtems_extensions_table *e = &rtems_extension->Extension.Callouts; rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_create, - e->thread_create); + (void *) e->thread_create); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_start, - e->thread_start); + (void *) e->thread_start); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_restart, - e->thread_restart); + (void *) e->thread_restart); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_delete, - e->thread_delete); + (void *) e->thread_delete); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_tswitch, - e->thread_switch); + (void *) e->thread_switch); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_begin, - e->thread_begin); + (void *) e->thread_begin); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_exitted, - e->thread_exitted); + (void *) e->thread_exitted); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_fatal, - e->fatal); + (void *) e->fatal); } void diff --git a/c/src/lib/libmisc/monitor/mon-itask.c b/c/src/lib/libmisc/monitor/mon-itask.c index 8d7b48277e..0f7c2740ce 100644 --- a/c/src/lib/libmisc/monitor/mon-itask.c +++ b/c/src/lib/libmisc/monitor/mon-itask.c @@ -22,7 +22,7 @@ rtems_monitor_init_task_canonical( rtems_initialization_tasks_table *rtems_itask = itask_void; rtems_monitor_symbol_canonical_by_value(&canonical_itask->entry, - rtems_itask->entry_point); + (void *) rtems_itask->entry_point); canonical_itask->argument = rtems_itask->argument; canonical_itask->stack_size = rtems_itask->stack_size; diff --git a/c/src/lib/libmisc/monitor/mon-manager.c b/c/src/lib/libmisc/monitor/mon-manager.c index af8d530d3b..523fa6aded 100644 --- a/c/src/lib/libmisc/monitor/mon-manager.c +++ b/c/src/lib/libmisc/monitor/mon-manager.c @@ -26,7 +26,7 @@ rtems_monitor_manager_next( Objects_Information *table = table_void; rtems_monitor_generic_t *copy; Objects_Control *object = 0; - unsigned32 location; + Objects_Locations location; /* * When we are called, it must be local diff --git a/c/src/lib/libmisc/monitor/mon-monitor.c b/c/src/lib/libmisc/monitor/mon-monitor.c index a5a3fab131..0025266e03 100644 --- a/c/src/lib/libmisc/monitor/mon-monitor.c +++ b/c/src/lib/libmisc/monitor/mon-monitor.c @@ -415,6 +415,7 @@ rtems_monitor_symbols_loadup(void) } done: + return; } diff --git a/c/src/lib/libmisc/monitor/mon-mpci.c b/c/src/lib/libmisc/monitor/mon-mpci.c index 5c4d2c2cb3..cf88922b2b 100644 --- a/c/src/lib/libmisc/monitor/mon-mpci.c +++ b/c/src/lib/libmisc/monitor/mon-mpci.c @@ -45,16 +45,16 @@ rtems_monitor_mpci_canonical( canonical_mpci->maximum_packet_size = mt->maximum_packet_size; rtems_monitor_symbol_canonical_by_value(&canonical_mpci->initialization, - mt->initialization); + (void *) mt->initialization); rtems_monitor_symbol_canonical_by_value(&canonical_mpci->get_packet, - mt->get_packet); + (void *) mt->get_packet); rtems_monitor_symbol_canonical_by_value(&canonical_mpci->return_packet, - mt->return_packet); + (void *) mt->return_packet); rtems_monitor_symbol_canonical_by_value(&canonical_mpci->send_packet, - mt->send_packet); + (void *) mt->send_packet); rtems_monitor_symbol_canonical_by_value(&canonical_mpci->receive_packet, - mt->receive_packet); + (void *) mt->receive_packet); } /* diff --git a/c/src/lib/libmisc/monitor/mon-object.c b/c/src/lib/libmisc/monitor/mon-object.c index 0dfc6513d2..90de35ee7b 100644 --- a/c/src/lib/libmisc/monitor/mon-object.c +++ b/c/src/lib/libmisc/monitor/mon-object.c @@ -21,6 +21,7 @@ #include #include /* strtoul() */ +#include /* memcpy() */ #include @@ -371,4 +372,5 @@ not_found: printf("Invalid or unsupported type %d\n", type); } } done: + return; } diff --git a/c/src/lib/libmisc/monitor/mon-server.c b/c/src/lib/libmisc/monitor/mon-server.c index cc26718c27..af155684fb 100644 --- a/c/src/lib/libmisc/monitor/mon-server.c +++ b/c/src/lib/libmisc/monitor/mon-server.c @@ -299,4 +299,5 @@ rtems_monitor_server_init( } done: + return; } diff --git a/c/src/lib/libmisc/monitor/mon-task.c b/c/src/lib/libmisc/monitor/mon-task.c index b1a7938eb5..9592d9d99b 100644 --- a/c/src/lib/libmisc/monitor/mon-task.c +++ b/c/src/lib/libmisc/monitor/mon-task.c @@ -8,6 +8,7 @@ #include "monitor.h" #include +#include /* memcpy() */ void rtems_monitor_task_canonical( diff --git a/c/src/lib/libmisc/monitor/monitor.h b/c/src/lib/libmisc/monitor/monitor.h index 8a86b2c7d0..1844add643 100644 --- a/c/src/lib/libmisc/monitor/monitor.h +++ b/c/src/lib/libmisc/monitor/monitor.h @@ -41,7 +41,7 @@ typedef enum { RTEMS_MONITOR_OBJECT_CONFIG, RTEMS_MONITOR_OBJECT_INIT_TASK, RTEMS_MONITOR_OBJECT_MPCI, - RTEMS_MONITOR_OBJECT_SYMBOL, + RTEMS_MONITOR_OBJECT_SYMBOL } rtems_monitor_object_type_t; /* diff --git a/c/src/libmisc/monitor/mon-driver.c b/c/src/libmisc/monitor/mon-driver.c index d5cff24a19..065172534c 100644 --- a/c/src/libmisc/monitor/mon-driver.c +++ b/c/src/libmisc/monitor/mon-driver.c @@ -40,18 +40,18 @@ rtems_monitor_driver_canonical( rtems_driver_address_table *d = (rtems_driver_address_table *) driver_void; rtems_monitor_symbol_canonical_by_value(&canonical_driver->initialization, - d->initialization); + (void *) d->initialization); rtems_monitor_symbol_canonical_by_value(&canonical_driver->open, - d->open); + (void *) d->open); rtems_monitor_symbol_canonical_by_value(&canonical_driver->close, - d->close); + (void *) d->close); rtems_monitor_symbol_canonical_by_value(&canonical_driver->read, - d->read); + (void *) d->read); rtems_monitor_symbol_canonical_by_value(&canonical_driver->write, - d->write); + (void *) d->write); rtems_monitor_symbol_canonical_by_value(&canonical_driver->control, - d->control); + (void *) d->control); } diff --git a/c/src/libmisc/monitor/mon-extension.c b/c/src/libmisc/monitor/mon-extension.c index 4afecaa617..18f6cf2d47 100644 --- a/c/src/libmisc/monitor/mon-extension.c +++ b/c/src/libmisc/monitor/mon-extension.c @@ -19,22 +19,22 @@ rtems_monitor_extension_canonical( rtems_extensions_table *e = &rtems_extension->Extension.Callouts; rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_create, - e->thread_create); + (void *) e->thread_create); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_start, - e->thread_start); + (void *) e->thread_start); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_restart, - e->thread_restart); + (void *) e->thread_restart); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_delete, - e->thread_delete); + (void *) e->thread_delete); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_tswitch, - e->thread_switch); + (void *) e->thread_switch); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_begin, - e->thread_begin); + (void *) e->thread_begin); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_exitted, - e->thread_exitted); + (void *) e->thread_exitted); rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_fatal, - e->fatal); + (void *) e->fatal); } void diff --git a/c/src/libmisc/monitor/mon-itask.c b/c/src/libmisc/monitor/mon-itask.c index 8d7b48277e..0f7c2740ce 100644 --- a/c/src/libmisc/monitor/mon-itask.c +++ b/c/src/libmisc/monitor/mon-itask.c @@ -22,7 +22,7 @@ rtems_monitor_init_task_canonical( rtems_initialization_tasks_table *rtems_itask = itask_void; rtems_monitor_symbol_canonical_by_value(&canonical_itask->entry, - rtems_itask->entry_point); + (void *) rtems_itask->entry_point); canonical_itask->argument = rtems_itask->argument; canonical_itask->stack_size = rtems_itask->stack_size; diff --git a/c/src/libmisc/monitor/mon-manager.c b/c/src/libmisc/monitor/mon-manager.c index af8d530d3b..523fa6aded 100644 --- a/c/src/libmisc/monitor/mon-manager.c +++ b/c/src/libmisc/monitor/mon-manager.c @@ -26,7 +26,7 @@ rtems_monitor_manager_next( Objects_Information *table = table_void; rtems_monitor_generic_t *copy; Objects_Control *object = 0; - unsigned32 location; + Objects_Locations location; /* * When we are called, it must be local diff --git a/c/src/libmisc/monitor/mon-monitor.c b/c/src/libmisc/monitor/mon-monitor.c index a5a3fab131..0025266e03 100644 --- a/c/src/libmisc/monitor/mon-monitor.c +++ b/c/src/libmisc/monitor/mon-monitor.c @@ -415,6 +415,7 @@ rtems_monitor_symbols_loadup(void) } done: + return; } diff --git a/c/src/libmisc/monitor/mon-mpci.c b/c/src/libmisc/monitor/mon-mpci.c index 5c4d2c2cb3..cf88922b2b 100644 --- a/c/src/libmisc/monitor/mon-mpci.c +++ b/c/src/libmisc/monitor/mon-mpci.c @@ -45,16 +45,16 @@ rtems_monitor_mpci_canonical( canonical_mpci->maximum_packet_size = mt->maximum_packet_size; rtems_monitor_symbol_canonical_by_value(&canonical_mpci->initialization, - mt->initialization); + (void *) mt->initialization); rtems_monitor_symbol_canonical_by_value(&canonical_mpci->get_packet, - mt->get_packet); + (void *) mt->get_packet); rtems_monitor_symbol_canonical_by_value(&canonical_mpci->return_packet, - mt->return_packet); + (void *) mt->return_packet); rtems_monitor_symbol_canonical_by_value(&canonical_mpci->send_packet, - mt->send_packet); + (void *) mt->send_packet); rtems_monitor_symbol_canonical_by_value(&canonical_mpci->receive_packet, - mt->receive_packet); + (void *) mt->receive_packet); } /* diff --git a/c/src/libmisc/monitor/mon-object.c b/c/src/libmisc/monitor/mon-object.c index 0dfc6513d2..90de35ee7b 100644 --- a/c/src/libmisc/monitor/mon-object.c +++ b/c/src/libmisc/monitor/mon-object.c @@ -21,6 +21,7 @@ #include #include /* strtoul() */ +#include /* memcpy() */ #include @@ -371,4 +372,5 @@ not_found: printf("Invalid or unsupported type %d\n", type); } } done: + return; } diff --git a/c/src/libmisc/monitor/mon-server.c b/c/src/libmisc/monitor/mon-server.c index cc26718c27..af155684fb 100644 --- a/c/src/libmisc/monitor/mon-server.c +++ b/c/src/libmisc/monitor/mon-server.c @@ -299,4 +299,5 @@ rtems_monitor_server_init( } done: + return; } diff --git a/c/src/libmisc/monitor/mon-task.c b/c/src/libmisc/monitor/mon-task.c index b1a7938eb5..9592d9d99b 100644 --- a/c/src/libmisc/monitor/mon-task.c +++ b/c/src/libmisc/monitor/mon-task.c @@ -8,6 +8,7 @@ #include "monitor.h" #include +#include /* memcpy() */ void rtems_monitor_task_canonical( diff --git a/c/src/libmisc/monitor/monitor.h b/c/src/libmisc/monitor/monitor.h index 8a86b2c7d0..1844add643 100644 --- a/c/src/libmisc/monitor/monitor.h +++ b/c/src/libmisc/monitor/monitor.h @@ -41,7 +41,7 @@ typedef enum { RTEMS_MONITOR_OBJECT_CONFIG, RTEMS_MONITOR_OBJECT_INIT_TASK, RTEMS_MONITOR_OBJECT_MPCI, - RTEMS_MONITOR_OBJECT_SYMBOL, + RTEMS_MONITOR_OBJECT_SYMBOL } rtems_monitor_object_type_t; /* -- cgit v1.2.3