diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-18 06:05:35 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-18 06:05:35 +0000 |
| commit | 50f32b11653429546d7b8ff2693b5232b885e201 (patch) | |
| tree | a8821a7e3025ef47082cc21ccbb56551382cdc3f /cpukit/libcsupport | |
| parent | Remove stray white spaces. (diff) | |
| download | rtems-50f32b11653429546d7b8ff2693b5232b885e201.tar.bz2 | |
Remove stray white spaces.
Diffstat (limited to '')
61 files changed, 392 insertions, 392 deletions
diff --git a/cpukit/libcsupport/include/chain.h b/cpukit/libcsupport/include/chain.h index 25cdca98aa..36c526a614 100644 --- a/cpukit/libcsupport/include/chain.h +++ b/cpukit/libcsupport/include/chain.h @@ -1,5 +1,5 @@ /* chain.h - * + * * This include file contains all the constants and structures associated * with doubly linked chains. This file actually just provides an * interface to the chain object in rtems. @@ -19,17 +19,17 @@ #include <rtems.h> -/* +/* * Chain_Initialize * * This routine initializes the_chain structure to manage the * contiguous array of number_nodes nodes which starts at * starting_address. Each node is of node_size bytes. * - * Chain_Control *the_chain, * IN * - * void *starting_address, * IN * - * uint32_t number_nodes, * IN * - * uint32_t node_size * IN * + * Chain_Control *the_chain, * IN * + * void *starting_address, * IN * + * uint32_t number_nodes, * IN * + * uint32_t node_size * IN * */ #define Chain_Initialize( the_chain, starting_address, \ @@ -38,17 +38,17 @@ number_nodes, node_size ) \ -/* +/* * Chain_Initialize_empty * * This routine initializes the specified chain to contain zero nodes. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Initialize_empty( the_chain ) \ _Chain_Initialize_empty( the_chain ) - + /* * Chain_Are_nodes_equal @@ -56,43 +56,43 @@ * This function returns TRUE if LEFT and RIGHT are equal, * and FALSE otherwise. * - * Chain_Node *left, * IN * - * Chain_Node *right * IN * + * Chain_Node *left, * IN * + * Chain_Node *right * IN * */ - + #define Chain_Are_nodes_equal( left, right ) \ _Chain_Are_nodes_equal( left, right ) -/* +/* * Chain_Extract_unprotected * * This routine extracts the_node from the chain on which it resides. * It does NOT disable interrupts to insure the atomicity of the * extract operation. * - * Chain_Node *the_node * IN * + * Chain_Node *the_node * IN * */ #define Chain_Extract_unprotected( the_node ) \ _Chain_Extract_unprotected( the_node ) -/* +/* * Chain_Extract * * This routine extracts the_node from the chain on which it resides. * It disables interrupts to insure the atomicity of the * extract operation. * - * Chain_Node *the_node * IN * + * Chain_Node *the_node * IN * */ #define Chain_Extract( the_node ) \ _Chain_Extract( the_node ) -/* +/* * Chain_Get_unprotected * * This function removes the first node from the_chain and returns @@ -100,14 +100,14 @@ * It does NOT disable interrupts to insure the atomicity of the * get operation. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Get_unprotected( the_chain ) \ _Chain_Get_unprotected( the_chain ) -/* +/* * Chain_Get * * This function removes the first node from the_chain and returns @@ -115,239 +115,239 @@ * It disables interrupts to insure the atomicity of the * get operation. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Get( the_chain ) \ _Chain_Get( the_chain ) -/* +/* * Chain_Get_first_unprotected * * This function removes the first node from the_chain and returns * a pointer to that node. It does NOT disable interrupts to insure * the atomicity of the get operation. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Get_first_unprotected( the_chain ) \ _Chain_Get_first_unprotected( the_chain ) -/* +/* * Chain_Insert_unprotected * * This routine inserts the_node on a chain immediately following * after_node. It does NOT disable interrupts to insure the atomicity * of the extract operation. * - * Chain_Node *after_node, * IN * - * Chain_Node *the_node * IN * + * Chain_Node *after_node, * IN * + * Chain_Node *the_node * IN * */ #define Chain_Insert_unprotected( after_node, the_node ) \ _Chain_Insert_unprotected( after_node, the_node ) -/* +/* * Chain_Insert * * This routine inserts the_node on a chain immediately following * after_node. It disables interrupts to insure the atomicity * of the extract operation. * - * Chain_Node *after_node, * IN * - * Chain_Node *the_node * IN * + * Chain_Node *after_node, * IN * + * Chain_Node *the_node * IN * */ #define Chain_Insert( after_node, the_node ) \ _Chain_Insert( after_node, the_node ) -/* +/* * Chain_Append_unprotected * * This routine appends the_node onto the end of the_chain. * It does NOT disable interrupts to insure the atomicity of the * append operation. * - * Chain_Control *the_chain, * IN * - * Chain_Node *the_node * IN * + * Chain_Control *the_chain, * IN * + * Chain_Node *the_node * IN * */ #define Chain_Append_unprotected( the_chain, the_node ) \ _Chain_Append_unprotected( the_chain, the_node ) -/* +/* * Chain_Append * * This routine appends the_node onto the end of the_chain. * It disables interrupts to insure the atomicity of the * append operation. * - * Chain_Control *the_chain, * IN * - * Chain_Node *the_node * IN * + * Chain_Control *the_chain, * IN * + * Chain_Node *the_node * IN * */ #define Chain_Append( the_chain, the_node ) \ _Chain_Append( the_chain, the_node ) -/* +/* * Chain_Prepend_unprotected * * This routine prepends the_node onto the front of the_chain. * It does NOT disable interrupts to insure the atomicity of the * prepend operation. * - * Chain_Control *the_chain, * IN * - * Chain_Node *the_node * IN * + * Chain_Control *the_chain, * IN * + * Chain_Node *the_node * IN * */ #define Chain_Prepend_unprotected( the_chain, the_node ) \ _Chain_Prepend_unprotected( the_chain, the_node ) -/* +/* * Chain_Prepend * * This routine prepends the_node onto the front of the_chain. * It disables interrupts to insure the atomicity of the * prepend operation. * - * Chain_Control *the_chain, * IN * - * Chain_Node *the_node * IN * + * Chain_Control *the_chain, * IN * + * Chain_Node *the_node * IN * */ #define Chain_Prepend( the_chain, the_node ) \ _Chain_Prepend( the_chain, the_node ) -/* +/* * Chain_Head * * This function returns a pointer to the first node on the chain. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Head( the_chain ) \ _Chain_Head( the_chain ) -/* +/* * Chain_Tail * * This function returns a pointer to the last node on the chain. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Tail( the_chain ) \ _Chain_Tail( the_chain ) -/* +/* * Chain_Is_head * * This function returns TRUE if the_node is the head of the_chain and * FALSE otherwise. * - * Chain_Control *the_chain, * IN * - * Chain_Node *the_node * IN * + * Chain_Control *the_chain, * IN * + * Chain_Node *the_node * IN * */ #define Chain_Is_head( the_chain, the_node ) \ _Chain_Is_head( the_chain, the_node ) -/* +/* * Chain_Is_tail * * This function returns TRUE if the_node is the tail of the_chain and * FALSE otherwise. * - * Chain_Control *the_chain, * IN * - * Chain_Node *the_node * IN * + * Chain_Control *the_chain, * IN * + * Chain_Node *the_node * IN * */ #define Chain_Is_tail( the_chain, the_node ) \ _Chain_Is_tail( the_chain, the_node ) -/* +/* * Chain_Is_first * * This function returns TRUE if the_node is the first node on a chain and * FALSE otherwise. * - * Chain_Node *the_node * IN * + * Chain_Node *the_node * IN * */ #define Chain_Is_first( the_node ) \ _Chain_Is_first( the_node ) -/* +/* * Chain_Is_last * * This function returns TRUE if the_node is the last node on a chain and * FALSE otherwise. * - * Chain_Node *the_node * IN * + * Chain_Node *the_node * IN * */ #define Chain_Is_last( the_node ) \ _Chain_Is_last( the_node ) -/* +/* * Chain_Is_empty * * This function returns TRUE if there are no nodes on the_chain and * FALSE otherwise. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Is_empty( the_chain ) \ _Chain_Is_empty( the_chain ) -/* +/* * Chain_Has_only_one_node * * This function returns TRUE if there is only one node on the_chain and * FALSE otherwise. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Has_only_one_node( the_chain ) \ _Chain_Has_only_one_node( the_chain ) -/* +/* * Chain_Is_null * * This function returns TRUE if the_chain is NULL and FALSE otherwise. * - * Chain_Control *the_chain * IN * + * Chain_Control *the_chain * IN * */ #define Chain_Is_null( the_chain ) \ _Chain_Is_null( the_chain ) -/* +/* * Chain_Is_null_node * * This function returns TRUE if the_node is NULL and FALSE otherwise. * - * Chain_Node *the_node * IN * + * Chain_Node *the_node * IN * */ #define Chain_Is_null_node( the_node ) \ diff --git a/cpukit/libcsupport/include/clockdrv.h b/cpukit/libcsupport/include/clockdrv.h index ed7e83cf51..1bec3362b0 100644 --- a/cpukit/libcsupport/include/clockdrv.h +++ b/cpukit/libcsupport/include/clockdrv.h @@ -29,7 +29,7 @@ extern rtems_device_minor_number rtems_clock_minor; #define CLOCK_DRIVER_TABLE_ENTRY \ { Clock_initialize, NULL, NULL, NULL, NULL, Clock_control } - + rtems_device_driver Clock_initialize( rtems_device_major_number, rtems_device_minor_number, diff --git a/cpukit/libcsupport/include/motorola/mc68681.h b/cpukit/libcsupport/include/motorola/mc68681.h index 0a5e09ad3a..5196f7ff75 100644 --- a/cpukit/libcsupport/include/motorola/mc68681.h +++ b/cpukit/libcsupport/include/motorola/mc68681.h @@ -83,15 +83,15 @@ -#define MC68681_CLEAR 0x00 +#define MC68681_CLEAR 0x00 #define MC68681_PORT_A 0 #define MC68681_PORT_B 1 -/* - * DUART Command Register Definitions: +/* + * DUART Command Register Definitions: * - * MC68681_COMMAND_REG_A,MC68681_COMMAND_REG_B + * MC68681_COMMAND_REG_A,MC68681_COMMAND_REG_B */ #define MC68681_MODE_REG_ENABLE_RX 0x01 #define MC68681_MODE_REG_DISABLE_RX 0x02 @@ -114,8 +114,8 @@ /* * Mode Register Definitions * - * MC68681_MODE_REG_1A - * MC68681_MODE_REG_1B + * MC68681_MODE_REG_1A + * MC68681_MODE_REG_1B */ #define MC68681_5BIT_CHARS 0x00 #define MC68681_6BIT_CHARS 0x01 @@ -186,17 +186,17 @@ #define MC68681_RECEIVED_BREAK 0x80 -/* - * Interupt Status Register Definitions. +/* + * Interupt Status Register Definitions. * - * MC68681_INTERRUPT_STATUS_REG + * MC68681_INTERRUPT_STATUS_REG */ -/* - * Interupt Mask Register Definitions +/* + * Interupt Mask Register Definitions * - * MC68681_INTERRUPT_MASK_REG + * MC68681_INTERRUPT_MASK_REG */ #define MC68681_IR_TX_READY_A 0x01 #define MC68681_IR_RX_READY_A 0x02 @@ -207,10 +207,10 @@ #define MC68681_IR_BREAK_B 0x40 #define MC68681_IR_INPUT_PORT_CHANGE 0x80 -/* - * Status Register Definitions. - * - * MC68681_STATUS_REG_A,MC68681_STATUS_REG_B +/* + * Status Register Definitions. + * + * MC68681_STATUS_REG_A,MC68681_STATUS_REG_B */ #define MC68681_STATUS_RXRDY 0x01 #define MC68681_STATUS_FFULL 0x02 @@ -221,34 +221,34 @@ #define MC68681_STATUS_FRAMING_ERROR 0x40 #define MC68681_STATUS_RECEIVED_BREAK 0x80 -/* - * Definitions for the Interrupt Vector Register: +/* + * Definitions for the Interrupt Vector Register: * - * MC68681_INTERRUPT_VECTOR_REG + * MC68681_INTERRUPT_VECTOR_REG */ #define MC68681_INTERRUPT_VECTOR_INIT 0x0f -/* - * Definitions for the Auxiliary Control Register +/* + * Definitions for the Auxiliary Control Register * - * MC68681_AUX_CTRL_REG + * MC68681_AUX_CTRL_REG */ #define MC68681_AUX_BRG_SET1 0x00 #define MC68681_AUX_BRG_SET2 0x80 -/* - * The following Baud rates assume the X1 clock pin is driven with a +/* + * The following Baud rates assume the X1 clock pin is driven with a * 3.6864 MHz signal. If a different frequency is used the DUART channel * is running at the follwoing baud rate: - * ((Table Baud Rate)*frequency)/3.6864 MHz + * ((Table Baud Rate)*frequency)/3.6864 MHz */ -/* - * Definitions for the Clock Select Register: +/* + * Definitions for the Clock Select Register: + * + * MC68681_CLOCK_SELECT_REG_A,MC68681_CLOCK_SELECT_REG_A * - * MC68681_CLOCK_SELECT_REG_A,MC68681_CLOCK_SELECT_REG_A - * * Note: ACR[7] is the MSB of the Auxiliary Control register * X is the extend bit. * CRA - 0x08 Set Rx BRG Select Extend Bit (X=1) @@ -260,8 +260,8 @@ /* ARC[7]=1,X=1 */ #define MC68681_BAUD_RATE_MASK_75 0x00 /* ACR[7]=0,X=0 */ /* ARC[7]=1,X=1 */ -#define MC68681_BAUD_RATE_MASK_110 0x01 -#define MC68681_BAUD_RATE_MASK_134_5 0x02 +#define MC68681_BAUD_RATE_MASK_110 0x01 +#define MC68681_BAUD_RATE_MASK_134_5 0x02 #define MC68681_BAUD_RATE_MASK_150 0x03 /* ACR[7]=0,X=0 */ /* ARC[7]=1,X=1 */ #define MC68681_BAUD_RATE_MASK_200 0x03 /* ACR[7]=0,X=0 */ @@ -280,10 +280,10 @@ /* ARC[7]=1,X=1 */ #define MC68681_BAUD_RATE_MASK_3600 0x04 /* ACR[7]=0,X=0 */ /* ARC[7]=1,X=1 */ -#define MC68681_BAUD_RATE_MASK_4800 0x09 +#define MC68681_BAUD_RATE_MASK_4800 0x09 #define MC68681_BAUD_RATE_MASK_7200 0x0a /* ACR[7]=0,X=0 */ /* ARC[7]=1,X=1 */ -#define MC68681_BAUD_RATE_MASK_9600 0xbb +#define MC68681_BAUD_RATE_MASK_9600 0xbb #define MC68681_BAUD_RATE_MASK_14_4K 0x05 /* ACR[7]=0,X=0 */ /* ARC[7]=1,X=1 */ @@ -295,9 +295,9 @@ /* ARC[7]=1,X=1 */ #define MC68681_BAUD_RATE_MASK_57_6K 0x07 /* ACR[7]=0,X=0 */ /* ARC[7]=1,X=1 */ -#define MC68681_BAUD_RATE_MASK_115_5K 0x08 -#define MC68681_BAUD_RATE_MASK_TIMER 0xdd -#define MC68681_BAUD_RATE_MASK_TIMER_16X 0xee -#define MC68681_BAUD_RATE_MASK_TIMER_1X 0xff +#define MC68681_BAUD_RATE_MASK_115_5K 0x08 +#define MC68681_BAUD_RATE_MASK_TIMER 0xdd +#define MC68681_BAUD_RATE_MASK_TIMER_16X 0xee +#define MC68681_BAUD_RATE_MASK_TIMER_1X 0xff #endif diff --git a/cpukit/libcsupport/include/ringbuf.h b/cpukit/libcsupport/include/ringbuf.h index 8639ff4fb8..3895b82274 100644 --- a/cpukit/libcsupport/include/ringbuf.h +++ b/cpukit/libcsupport/include/ringbuf.h @@ -1,5 +1,5 @@ /* - * ringbuf.h + * ringbuf.h * * This file provides simple ring buffer functionality. * @@ -22,8 +22,8 @@ typedef struct { #define Ring_buffer_Initialize( _buffer ) \ do { \ (_buffer)->head = (_buffer)->tail = 0; \ - } while ( 0 ) - + } while ( 0 ) + #define Ring_buffer_Is_empty( _buffer ) \ ( (_buffer)->head == (_buffer)->tail ) @@ -38,7 +38,7 @@ typedef struct { (_buffer)->tail = ((_buffer)->tail+1) % RINGBUF_QUEUE_LENGTH; \ (_buffer)->buffer[ (_buffer)->tail ] = (_ch); \ rtems_interrupt_enable( isrlevel ); \ - } while ( 0 ) + } while ( 0 ) #define Ring_buffer_Remove_character( _buffer, _ch ) \ do { \ @@ -48,6 +48,6 @@ typedef struct { (_buffer)->head = ((_buffer)->head+1) % RINGBUF_QUEUE_LENGTH; \ (_ch) = (_buffer)->buffer[ (_buffer)->head ]; \ rtems_interrupt_enable( isrlevel ); \ - } while ( 0 ) + } while ( 0 ) #endif diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index 498ecd1f59..4819be4868 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -140,9 +140,9 @@ struct _rtems_filesystem_file_handlers_r { /* * XXX - * This routine does not allocate any space and rtems_filesystem_freenode_t + * This routine does not allocate any space and rtems_filesystem_freenode_t * is not called by the generic after calling this routine. - * ie. node_access does not have to contain valid data when the + * ie. node_access does not have to contain valid data when the * routine returns. */ @@ -228,9 +228,9 @@ typedef int (*rtems_filesystem_symlink_t)( ); typedef int (*rtems_filesystem_readlink_t)( - rtems_filesystem_location_info_t *loc, /* IN */ - char *buf, /* OUT */ - size_t bufsize + rtems_filesystem_location_info_t *loc, /* IN */ + char *buf, /* OUT */ + size_t bufsize ); /* @@ -342,7 +342,7 @@ struct rtems_libio_tt { off_t offset; /* current offset into file */ uint32_t flags; rtems_filesystem_location_info_t pathinfo; - Objects_Id sem; + Objects_Id sem; uint32_t data0; /* private to "driver" */ void *data1; /* ... */ void *file_info; /* used by file handlers */ @@ -476,8 +476,8 @@ union __rtems_dev_t { } __overlay; }; -static inline dev_t rtems_filesystem_make_dev_t( - rtems_device_major_number _major, +static inline dev_t rtems_filesystem_make_dev_t( + rtems_device_major_number _major, rtems_device_minor_number _minor ) { diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/libcsupport/include/rtems/libio_.h index cc5b4ff7bc..3662202e2e 100644 --- a/cpukit/libcsupport/include/rtems/libio_.h +++ b/cpukit/libcsupport/include/rtems/libio_.h @@ -21,7 +21,7 @@ extern "C" { #include <rtems.h> #include <rtems/libio.h> /* include before standard IO */ -#include <sys/types.h> +#include <sys/types.h> #include <errno.h> @@ -64,9 +64,9 @@ extern rtems_libio_t *rtems_libio_iop_freelist; #define rtems_libio_iop_to_descriptor(_iop) \ ((!(_iop)) ? -1 : (_iop - rtems_libio_iops)) -/* +/* * rtems_libio_check_is_open - * + * * Macro to check if a file descriptor is actually open. */ @@ -190,8 +190,8 @@ extern rtems_libio_t *rtems_libio_iop_freelist; */ #include <rtems/userenv.h> -extern rtems_user_env_t * rtems_current_user_env; -extern rtems_user_env_t rtems_global_user_env; +extern rtems_user_env_t * rtems_current_user_env; +extern rtems_user_env_t rtems_global_user_env; /* * Instantiate a private copy of the per user information for the calling task. @@ -199,7 +199,7 @@ extern rtems_user_env_t rtems_global_user_env; rtems_status_code rtems_libio_set_private_env(void); rtems_status_code rtems_libio_share_private_env(rtems_id task_id) ; - + /* * File Descriptor Routine Prototypes */ diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/cpukit/libcsupport/include/rtems/termiostypes.h index ab5968d0a2..92f8c97b1c 100644 --- a/cpukit/libcsupport/include/rtems/termiostypes.h +++ b/cpukit/libcsupport/include/rtems/termiostypes.h @@ -37,7 +37,7 @@ struct rtems_termios_rawbuf { volatile unsigned int Head; volatile unsigned int Tail; volatile unsigned int Size; - rtems_id Semaphore; + rtems_id Semaphore; }; /* * Variables associated with each termios instance. @@ -112,8 +112,8 @@ struct rtems_termios_tty { /* * I/O task IDs (for task-driven drivers) */ - rtems_id rxTaskId; - rtems_id txTaskId; + rtems_id rxTaskId; + rtems_id txTaskId; /* * line discipline related stuff */ @@ -155,8 +155,8 @@ void rtems_termios_rxirq_occured(struct rtems_termios_tty *tty); * FIXME: this should move to termios.h! * put a string to output ring buffer */ -void rtems_termios_puts (const char *buf, - int len, +void rtems_termios_puts (const char *buf, + int len, struct rtems_termios_tty *tty); /* * global hooks for line disciplines diff --git a/cpukit/libcsupport/include/stdint.h b/cpukit/libcsupport/include/stdint.h index f31032b625..1c2652a5a0 100644 --- a/cpukit/libcsupport/include/stdint.h +++ b/cpukit/libcsupport/include/stdint.h @@ -1,4 +1,4 @@ -/* +/* * stdint.h * * ISO C99 integer types @@ -16,7 +16,7 @@ extern "C" { #include <rtems/score/types.h> /* - * map RTEMS internal types onto C99 types + * map RTEMS internal types onto C99 types */ typedef signed8 int8_t; typedef signed16 int16_t; diff --git a/cpukit/libcsupport/include/sys/utsname.h b/cpukit/libcsupport/include/sys/utsname.h index 1d6b47270b..ebe2f52785 100644 --- a/cpukit/libcsupport/include/sys/utsname.h +++ b/cpukit/libcsupport/include/sys/utsname.h @@ -1,4 +1,4 @@ -/* sys/utsname.h +/* sys/utsname.h * * $Id$ */ @@ -16,9 +16,9 @@ extern "C" { /* * 4.4.1 Get System Name (Table 4-1), P1003.1b-1993, p. 90 * - * NOTE: The lengths of the strings in this structure are + * NOTE: The lengths of the strings in this structure are * just long enough to reliably contain the RTEMS information. - * For example, the fields are not long enough to support + * For example, the fields are not long enough to support * Internet hostnames. */ diff --git a/cpukit/libcsupport/src/__times.c b/cpukit/libcsupport/src/__times.c index bebd110c4a..733befe8c9 100644 --- a/cpukit/libcsupport/src/__times.c +++ b/cpukit/libcsupport/src/__times.c @@ -41,7 +41,7 @@ clock_t _times( (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &ticks ); /* - * RTEMS technically has no notion of system versus user time + * RTEMS technically has no notion of system versus user time * since there is no separation of OS from application tasks. * But we can at least make a distinction between the number * of ticks since boot and the number of ticks executed by this diff --git a/cpukit/libcsupport/src/assoc.c b/cpukit/libcsupport/src/assoc.c index a7cd03b162..58c0b2e73f 100644 --- a/cpukit/libcsupport/src/assoc.c +++ b/cpukit/libcsupport/src/assoc.c @@ -27,7 +27,7 @@ rtems_assoc_ptr_by_name( if (rtems_assoc_is_default(ap)) default_ap = ap++; - + for ( ; ap->name; ap++) if (strcmp(ap->name, name) == 0) return ap; @@ -45,7 +45,7 @@ rtems_assoc_ptr_by_local( if (rtems_assoc_is_default(ap)) default_ap = ap++; - + for ( ; ap->name; ap++) if (ap->local_value == local_value) return ap; @@ -64,7 +64,7 @@ rtems_assoc_ptr_by_remote( if (rtems_assoc_is_default(ap)) default_ap = ap++; - + for ( ; ap->name; ap++) if (ap->remote_value == remote_value) return ap; @@ -77,7 +77,7 @@ rtems_assoc_ptr_by_remote( * Get values */ -uint32_t +uint32_t rtems_assoc_remote_by_local( const rtems_assoc_t *ap, uint32_t local_value @@ -87,11 +87,11 @@ rtems_assoc_remote_by_local( nap = rtems_assoc_ptr_by_local(ap, local_value); if (nap) return nap->remote_value; - + return 0; } -uint32_t +uint32_t rtems_assoc_local_by_remote( const rtems_assoc_t *ap, uint32_t remote_value @@ -101,11 +101,11 @@ rtems_assoc_local_by_remote( nap = rtems_assoc_ptr_by_remote(ap, remote_value); if (nap) return nap->local_value; - + return 0; } -uint32_t +uint32_t rtems_assoc_remote_by_name( const rtems_assoc_t *ap, const char *name @@ -115,11 +115,11 @@ rtems_assoc_remote_by_name( nap = rtems_assoc_ptr_by_name(ap, name); if (nap) return nap->remote_value; - + return 0; } -uint32_t +uint32_t rtems_assoc_local_by_name( const rtems_assoc_t *ap, const char *name @@ -129,7 +129,7 @@ rtems_assoc_local_by_name( nap = rtems_assoc_ptr_by_name(ap, name); if (nap) return nap->local_value; - + return 0; } @@ -155,7 +155,7 @@ rtems_assoc_name_by_local( nap = rtems_assoc_ptr_by_local(ap, local_value); if (nap) return nap->name; - + return rtems_assoc_name_bad(local_value); } @@ -169,7 +169,7 @@ rtems_assoc_name_by_remote( nap = rtems_assoc_ptr_by_remote(ap, remote_value); if (nap) return nap->name; - + return rtems_assoc_name_bad(remote_value); } @@ -182,14 +182,14 @@ uint32_t rtems_assoc_remote_by_local_bitfield( const rtems_assoc_t *ap, uint32_t local_value ) -{ +{ uint32_t b; uint32_t remote_value = 0; for (b = 1; b; b <<= 1) if (b & local_value) remote_value |= rtems_assoc_remote_by_local(ap, b); - + return remote_value; } @@ -198,14 +198,14 @@ uint32_t rtems_assoc_local_by_remote_bitfield( const rtems_assoc_t *ap, uint32_t remote_value ) -{ +{ uint32_t b; uint32_t local_value = 0; for (b = 1; b; b <<= 1) if (b & remote_value) local_value |= rtems_assoc_local_by_remote(ap, b); - + return local_value; } @@ -215,7 +215,7 @@ rtems_assoc_name_by_remote_bitfield( uint32_t value, char *buffer ) -{ +{ uint32_t b; *buffer = 0; @@ -227,7 +227,7 @@ rtems_assoc_name_by_remote_bitfield( strcat(buffer, " "); strcat(buffer, rtems_assoc_name_by_remote(ap, b)); } - + return buffer; } @@ -237,7 +237,7 @@ rtems_assoc_name_by_local_bitfield( uint32_t value, char *buffer ) -{ +{ uint32_t b; *buffer = 0; @@ -249,6 +249,6 @@ rtems_assoc_name_by_local_bitfield( strcat(buffer, " "); strcat(buffer, rtems_assoc_name_by_local(ap, b)); } - + return buffer; } diff --git a/cpukit/libcsupport/src/base_fs.c b/cpukit/libcsupport/src/base_fs.c index 60279afd4b..dedafc8d1c 100644 --- a/cpukit/libcsupport/src/base_fs.c +++ b/cpukit/libcsupport/src/base_fs.c @@ -35,7 +35,7 @@ rtems_user_env_t * rtems_current_user_env = &rtems_global_user_env; * rtems_filesystem_initialize * * Initialize the foundation of the file system. This is specified - * by the structure rtems_filesystem_mount_table. The usual + * by the structure rtems_filesystem_mount_table. The usual * configuration is a single instantiation of the IMFS or miniIMFS with * a single "/dev" directory in it. */ @@ -50,7 +50,7 @@ void rtems_filesystem_initialize( void ) rtems_filesystem_mount_table_entry_t *entry; rtems_filesystem_mount_table_t *mt; rtems_filesystem_location_info_t loc; - + /* * Set the default umask to "022". */ @@ -125,8 +125,8 @@ void rtems_filesystem_initialize( void ) /* * This code if if'ed 0 out because you can't mount another - * filesystem properly until the mount point it will be - * mounted onto is created. Moreover, if it is going to + * filesystem properly until the mount point it will be + * mounted onto is created. Moreover, if it is going to * use a device, then it is REALLY unfair to attempt this * before device drivers are initialized. */ diff --git a/cpukit/libcsupport/src/chdir.c b/cpukit/libcsupport/src/chdir.c index ab9811a59a..b508ea20ed 100644 --- a/cpukit/libcsupport/src/chdir.c +++ b/cpukit/libcsupport/src/chdir.c @@ -1,4 +1,4 @@ -/* +/* * chdir() - POSIX 1003.1b - 5.2.1 - Change Current Working Directory * * COPYRIGHT (c) 1989-1999. @@ -34,7 +34,7 @@ int chdir( * Get the node where we wish to go. */ - result = rtems_filesystem_evaluate_path( + result = rtems_filesystem_evaluate_path( pathname, RTEMS_LIBIO_PERMS_SEARCH, &loc, TRUE ); if ( result != 0 ) return -1; @@ -52,10 +52,10 @@ int chdir( rtems_filesystem_freenode( &loc ); rtems_set_errno_and_return_minus_one( ENOTDIR ); } - + rtems_filesystem_freenode( &rtems_filesystem_current ); - + rtems_filesystem_current = loc; - + return 0; } diff --git a/cpukit/libcsupport/src/chmod.c b/cpukit/libcsupport/src/chmod.c index 0535edfebd..1007be6b26 100644 --- a/cpukit/libcsupport/src/chmod.c +++ b/cpukit/libcsupport/src/chmod.c @@ -37,7 +37,7 @@ int chmod( status = rtems_filesystem_evaluate_path( path, 0, &loc, TRUE ); if ( status != 0 ) return -1; - + if ( !loc.handlers ){ rtems_filesystem_freenode( &loc ); rtems_set_errno_and_return_minus_one( EBADF ); @@ -51,6 +51,6 @@ int chmod( result = (*loc.handlers->fchmod_h)( &loc, mode ); rtems_filesystem_freenode( &loc ); - + return result; } diff --git a/cpukit/libcsupport/src/chown.c b/cpukit/libcsupport/src/chown.c index fc2968cccd..8ac0a91979 100644 --- a/cpukit/libcsupport/src/chown.c +++ b/cpukit/libcsupport/src/chown.c @@ -35,7 +35,7 @@ int chown( if ( rtems_filesystem_evaluate_path( path, 0x00, &loc, TRUE ) ) return -1; - + if ( !loc.ops->chown_h ) { rtems_filesystem_freenode( &loc ); rtems_set_errno_and_return_minus_one( ENOTSUP ); @@ -44,6 +44,6 @@ int chown( result = (*loc.ops->chown_h)( &loc, owner, group ); rtems_filesystem_freenode( &loc ); - + return result; } diff --git a/cpukit/libcsupport/src/chroot.c b/cpukit/libcsupport/src/chroot.c index 556d5277a6..648b0b872d 100644 --- a/cpukit/libcsupport/src/chroot.c +++ b/cpukit/libcsupport/src/chroot.c @@ -1,4 +1,4 @@ -/* +/* * chroot() - Change Root Directory * Author: fernando.ruiz@ctv.es * @@ -30,13 +30,13 @@ int chroot( { int result; rtems_filesystem_location_info_t loc; - + /* an automatic call to new private env the first time */ if (rtems_current_user_env == &rtems_global_user_env) { rtems_libio_set_private_env(); /* try to set a new private env*/ if (rtems_current_user_env == &rtems_global_user_env) /* not ok */ rtems_set_errno_and_return_minus_one( ENOTSUP ); - }; + }; result = chdir(pathname); if (result) { diff --git a/cpukit/libcsupport/src/closedir.c b/cpukit/libcsupport/src/closedir.c index 64562264ec..2204768a08 100644 --- a/cpukit/libcsupport/src/closedir.c +++ b/cpukit/libcsupport/src/closedir.c @@ -3,7 +3,7 @@ * * This was copied from Newlib 1.8.0. * - * + * * Copyright (c) 1983 Regents of the University of California. * All rights reserved. * diff --git a/cpukit/libcsupport/src/dup2.c b/cpukit/libcsupport/src/dup2.c index f90fc927eb..15998f797c 100644 --- a/cpukit/libcsupport/src/dup2.c +++ b/cpukit/libcsupport/src/dup2.c @@ -47,6 +47,6 @@ int dup2( /* * This fcntl handles everything else. */ - + return fcntl( fildes, F_DUPFD, fildes2 ); } diff --git a/cpukit/libcsupport/src/envlock.c b/cpukit/libcsupport/src/envlock.c index 444d0e6b63..687eb32753 100644 --- a/cpukit/libcsupport/src/envlock.c +++ b/cpukit/libcsupport/src/envlock.c @@ -1,6 +1,6 @@ /* * Author: Till Straumann <strauman@slac.stanford.edu>, 3/2002 - * + * * $Id$ */ @@ -33,7 +33,7 @@ * Used by the following functions: * findenv_r(), setenv_r(), and unsetenv_r() which are called by * getenv(), getenv_r(), setenv(), and unsetenv(). - * + * */ #if defined(ENVLOCK_DEDIDCATED_MUTEX) diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c index af3f8b0482..c004c3a63f 100644 --- a/cpukit/libcsupport/src/error.c +++ b/cpukit/libcsupport/src/error.c @@ -13,7 +13,7 @@ * These routines provide general purpose error reporting. * rtems_error reports an error to stderr and allows use of * printf style formatting. A newline is appended to all messages. - * + * * error_flag can be specified as any of the following: * * RTEMS_ERROR_ERRNO -- include errno text in output @@ -21,7 +21,7 @@ * RTEMS_ERROR_ABORT -- abort after output * * It can also include a rtems_status value which can be OR'd - * with the above flags. * + * with the above flags. * * * EXAMPLE * #include <rtems.h> @@ -135,11 +135,11 @@ static int rtems_verror( if (_System_state_Is_multiprocessing) fprintf(stderr, "[%d] ", _Configuration_MP_table->node); - + if (rtems_progname && *rtems_progname) chars_written += fprintf(stderr, "%s: ", rtems_progname); chars_written += vfprintf(stderr, printf_format, arglist); - + if (status) chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status)); @@ -150,7 +150,7 @@ static int rtems_verror( else chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno); } - + chars_written += fprintf(stderr, "\n"); (void) fflush(stderr); @@ -176,7 +176,7 @@ static int rtems_verror( * Report an error. * error_flag is as above; printf_format is a normal * printf(3) format string, with its concommitant arguments. - * + * * Returns the number of characters written. */ @@ -192,11 +192,11 @@ int rtems_error( va_start(arglist, printf_format); chars_written = rtems_verror(error_flag, printf_format, arglist); va_end(arglist); - + return chars_written; } -/* +/* * rtems_panic is shorthand for rtems_error(RTEMS_ERROR_PANIC, ...) */ diff --git a/cpukit/libcsupport/src/eval.c b/cpukit/libcsupport/src/eval.c index f80753fd25..7c9c0a7e47 100644 --- a/cpukit/libcsupport/src/eval.c +++ b/cpukit/libcsupport/src/eval.c @@ -41,7 +41,7 @@ int rtems_filesystem_evaluate_path( if ( !pathloc ) rtems_set_errno_and_return_minus_one( EIO ); /* should never happen */ - + /* * Evaluate the path using the optable evalpath. */ @@ -80,7 +80,7 @@ int rtems_filesystem_evaluate_path( * Let the FS implementation deal with this case. It * should probably free pathloc in either case: * - if the link evaluation fails, it must free the - * original (valid) pathloc because we are going + * original (valid) pathloc because we are going * to return -1 and hence the FS generics won't * cleanup pathloc. * - if the link evaluation is successful, the updated @@ -90,7 +90,7 @@ int rtems_filesystem_evaluate_path( */ result = (*pathloc->ops->eval_link_h)( pathloc, flags ); - + } } @@ -108,7 +108,7 @@ int rtems_filesystem_evaluate_parent( if ( !pathloc ) rtems_set_errno_and_return_minus_one( EIO ); /* should never happen */ - + if ( !pathloc->ops->evalpath_h ) rtems_set_errno_and_return_minus_one( ENOTSUP ); diff --git a/cpukit/libcsupport/src/fchdir.c b/cpukit/libcsupport/src/fchdir.c index ad5f8207a1..603288614d 100644 --- a/cpukit/libcsupport/src/fchdir.c +++ b/cpukit/libcsupport/src/fchdir.c @@ -30,7 +30,7 @@ int fchdir( { rtems_libio_t *iop; rtems_filesystem_location_info_t loc, saved; - + rtems_libio_check_fd( fd ); iop = rtems_libio_iop( fd ); rtems_libio_check_is_open(iop); @@ -57,7 +57,7 @@ int fchdir( RTEMS_FILESYSTEM_DIRECTORY ) { rtems_set_errno_and_return_minus_one( ENOTDIR ); } - + /* * FIXME : I feel there should be another call to @@ -71,10 +71,10 @@ int fchdir( * share their rtems_filesystem_current better * be synchronized! */ - + saved = rtems_filesystem_current; rtems_filesystem_current = iop->pathinfo; - + /* clone the current node */ if (rtems_filesystem_evaluate_path(".", 0, &loc, 0)) { /* cloning failed; restore original and bail out */ @@ -85,6 +85,6 @@ int fchdir( rtems_filesystem_freenode( &saved ); rtems_filesystem_current = loc; - + return 0; } diff --git a/cpukit/libcsupport/src/fchmod.c b/cpukit/libcsupport/src/fchmod.c index b1de832b4a..11d9c0e723 100644 --- a/cpukit/libcsupport/src/fchmod.c +++ b/cpukit/libcsupport/src/fchmod.c @@ -30,7 +30,7 @@ int fchmod( ) { rtems_libio_t *iop; - + rtems_libio_check_fd( fd ); iop = rtems_libio_iop( fd ); rtems_libio_check_is_open(iop); diff --git a/cpukit/libcsupport/src/fcntl.c b/cpukit/libcsupport/src/fcntl.c index 2b1a8280ad..641c25b1ae 100644 --- a/cpukit/libcsupport/src/fcntl.c +++ b/cpukit/libcsupport/src/fcntl.c @@ -35,7 +35,7 @@ static int vfcntl( int flags; int mask; int ret = 0; - + rtems_libio_check_fd( fd ); iop = rtems_libio_iop( fd ); rtems_libio_check_is_open(iop); @@ -78,7 +78,7 @@ static int vfcntl( * Interpret the third argument as the "close on exec()" flag. * If this argument is 1, then the file descriptor is to be closed * if a new process is exec()'ed. Since RTEMS does not support - * processes, then we can ignore this one except to make + * processes, then we can ignore this one except to make * F_GETFD work. */ @@ -136,10 +136,10 @@ static int vfcntl( /* * If we got this far successfully, then we give the optional - * filesystem specific handler a chance to process this. + * filesystem specific handler a chance to process this. */ - if (ret >= 0) { + if (ret >= 0) { if (iop->handlers->fcntl_h) { int err = (*iop->handlers->fcntl_h)( cmd, iop ); if (err) { diff --git a/cpukit/libcsupport/src/ftruncate.c b/cpukit/libcsupport/src/ftruncate.c index f010454233..6619ca5f74 100644 --- a/cpukit/libcsupport/src/ftruncate.c +++ b/cpukit/libcsupport/src/ftruncate.c @@ -28,7 +28,7 @@ int ftruncate( { rtems_libio_t *iop; rtems_filesystem_location_info_t loc; - + rtems_libio_check_fd( fd ); iop = rtems_libio_iop( fd ); rtems_libio_check_is_open(iop); @@ -36,7 +36,7 @@ int ftruncate( /* * Now process the ftruncate() request. */ - + /* * Make sure we are not working on a directory */ @@ -44,7 +44,7 @@ int ftruncate( loc = iop->pathinfo; if ( !loc.ops->node_type_h ) rtems_set_errno_and_return_minus_one( ENOTSUP ); - + if ( (*loc.ops->node_type_h)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) rtems_set_errno_and_return_minus_one( EISDIR ); diff --git a/cpukit/libcsupport/src/getdents.c b/cpukit/libcsupport/src/getdents.c index 819da1f4ff..ca4c36727f 100644 --- a/cpukit/libcsupport/src/getdents.c +++ b/cpukit/libcsupport/src/getdents.c @@ -47,7 +47,7 @@ int getdents( loc = iop->pathinfo; if ( !loc.ops->node_type_h ) rtems_set_errno_and_return_minus_one( ENOTSUP ); - + if ( (*loc.ops->node_type_h)( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) rtems_set_errno_and_return_minus_one( ENOTDIR ); diff --git a/cpukit/libcsupport/src/getegid.c b/cpukit/libcsupport/src/getegid.c index 3326727eec..4da7ba8d5b 100644 --- a/cpukit/libcsupport/src/getegid.c +++ b/cpukit/libcsupport/src/getegid.c @@ -22,7 +22,7 @@ gid_t _POSIX_types_Egid = 0; /*PAGE * - * 4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, + * 4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, * P1003.1b-1993, p. 84 */ diff --git a/cpukit/libcsupport/src/geteuid.c b/cpukit/libcsupport/src/geteuid.c index 9374999683..cb5b5add79 100644 --- a/cpukit/libcsupport/src/geteuid.c +++ b/cpukit/libcsupport/src/geteuid.c @@ -23,7 +23,7 @@ uid_t _POSIX_types_Euid = 0; /*PAGE * - * 4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, + * 4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, * P1003.1b-1993, p. 84 */ diff --git a/cpukit/libcsupport/src/getgid.c b/cpukit/libcsupport/src/getgid.c index f104a6a039..653445a99c 100644 --- a/cpukit/libcsupport/src/getgid.c +++ b/cpukit/libcsupport/src/getgid.c @@ -18,13 +18,13 @@ /* * MACRO in userenv.h - * + * gid_t _POSIX_types_Gid = 0; */ /*PAGE * - * 4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, + * 4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, * P1003.1b-1993, p. 84 */ diff --git a/cpukit/libcsupport/src/getlogin.c b/cpukit/libcsupport/src/getlogin.c index 64ee0b6d02..06b576f234 100644 --- a/cpukit/libcsupport/src/getlogin.c +++ b/cpukit/libcsupport/src/getlogin.c @@ -28,7 +28,7 @@ /* * MACRO in userenv.h - * + * static char _POSIX_types_Getlogin_buffer[ LOGIN_NAME_MAX ]; */ @@ -50,7 +50,7 @@ int getlogin_r( size_t namesize ) { - struct passwd *pw; + struct passwd *pw; if ( namesize < LOGIN_NAME_MAX ) return ERANGE; diff --git a/cpukit/libcsupport/src/getpwent.c b/cpukit/libcsupport/src/getpwent.c index 6ab52aac8c..1236ccacca 100644 --- a/cpukit/libcsupport/src/getpwent.c +++ b/cpukit/libcsupport/src/getpwent.c @@ -226,7 +226,7 @@ int getpwnam_r( return getpw_r(name, 0, pwd, buffer, bufsize, result); } -struct passwd *getpwnam( +struct passwd *getpwnam( const char *name ) { @@ -385,7 +385,7 @@ int getgrnam_r( return getgr_r(name, 0, grp, buffer, bufsize, result); } -struct group *getgrnam( +struct group *getgrnam( const char *name ) { diff --git a/cpukit/libcsupport/src/getuid.c b/cpukit/libcsupport/src/getuid.c index 09cc25e7c1..65e3184005 100644 --- a/cpukit/libcsupport/src/getuid.c +++ b/cpukit/libcsupport/src/getuid.c @@ -16,15 +16,15 @@ #include <rtems/userenv.h> -/* - * MACRO in userenv.h +/* + * MACRO in userenv.h * uid_t _POSIX_types_Uid = 0; */ /*PAGE * - * 4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, + * 4.2.1 Get Real User, Effective User, Ral Group, and Effective Group IDs, * P1003.1b-1993, p. 84 */ diff --git a/cpukit/libcsupport/src/gxx_wrappers.c b/cpukit/libcsupport/src/gxx_wrappers.c index 5f70724c3f..d500f3fb5e 100644 --- a/cpukit/libcsupport/src/gxx_wrappers.c +++ b/cpukit/libcsupport/src/gxx_wrappers.c @@ -13,7 +13,7 @@ * Eric sent some e-mail in the rtems-list as a start point for this * module implementation. * - * + * */ #if HAVE_CONFIG_H @@ -32,7 +32,7 @@ #include <rtems/error.h> /* rtems_panic */ #include <rtems/rtems/tasks.h> -/* +/* * These typedefs should match with the ones defined in the file * gcc/gthr-rtems.h in the gcc distribution. */ @@ -51,7 +51,7 @@ typedef void *__gthread_mutex_t; /* local function to return the ID of the calling thread */ static rtems_id get_tid( void ) { - rtems_id id = 0; + rtems_id id = 0; rtems_task_ident( RTEMS_SELF, 0, &id ); return id; } @@ -82,7 +82,7 @@ int rtems_gxx_key_create (__gthread_key_t *key, void (*dtor) (void *)) { /* Ok, this can be a bit tricky. We are going to return a "key" as a * pointer to the buffer that will hold the value of the key itself. - * We have to to this, becuase the others functions on this interface + * We have to to this, becuase the others functions on this interface * deal with the value of the key, as used with the POSIX API. */ /* Do not pull your hair, trust me this works. :-) */ @@ -195,7 +195,7 @@ int rtems_gxx_mutex_lock (__gthread_mutex_t *mutex) #ifdef DEBUG_GXX_WRAPPERS printk( "gxx_wrappers: lock mutex=%X\n", *mutex ); #endif - return ( rtems_semaphore_obtain( (rtems_id)*mutex, + return ( rtems_semaphore_obtain( (rtems_id)*mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT ) == RTEMS_SUCCESSFUL) ? 0 : -1; } @@ -204,7 +204,7 @@ int rtems_gxx_mutex_trylock (__gthread_mutex_t *mutex) #ifdef DEBUG_GXX_WRAPPERS printk( "gxx_wrappers: trylock mutex=%X\n", *mutex ); #endif - return (rtems_semaphore_obtain ((rtems_id)*mutex, + return (rtems_semaphore_obtain ((rtems_id)*mutex, RTEMS_NO_WAIT, 0) == RTEMS_SUCCESSFUL) ? 0 : -1; } diff --git a/cpukit/libcsupport/src/ioctl.c b/cpukit/libcsupport/src/ioctl.c index 78e22221be..ea05340a9d 100644 --- a/cpukit/libcsupport/src/ioctl.c +++ b/cpukit/libcsupport/src/ioctl.c @@ -29,8 +29,8 @@ int ioctl( int fd, int command, ... -) -{ +) +{ va_list ap; rtems_status_code rc; rtems_libio_t *iop; diff --git a/cpukit/libcsupport/src/isatty.c b/cpukit/libcsupport/src/isatty.c index d1ff7c0ab5..d1ee06ee97 100644 --- a/cpukit/libcsupport/src/isatty.c +++ b/cpukit/libcsupport/src/isatty.c @@ -1,7 +1,7 @@ /* * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). - * + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. diff --git a/cpukit/libcsupport/src/libio.c b/cpukit/libcsupport/src/libio.c index 3f59914bac..c30c54e2b3 100644 --- a/cpukit/libcsupport/src/libio.c +++ b/cpukit/libcsupport/src/libio.c @@ -44,9 +44,9 @@ #include <rtems/libio.h> /* libio.h not pulled in by rtems */ -/* +/* * File descriptor Table Information - */ + */ extern uint32_t rtems_libio_number_iops; rtems_id rtems_libio_semaphore; @@ -102,7 +102,7 @@ void rtems_libio_init( void ) /* * rtems_libio_fcntl_flags - * + * * Convert UNIX fnctl(2) flags to ones that RTEMS drivers understand */ @@ -131,7 +131,7 @@ uint32_t rtems_libio_fcntl_flags( /* * Access mode is a small integer */ - + access_modes = fcntl_flags & O_ACCMODE; fcntl_flags &= ~O_ACCMODE; flags = rtems_assoc_local_by_remote( access_modes_assoc, access_modes ); @@ -147,7 +147,7 @@ uint32_t rtems_libio_fcntl_flags( /* * rtems_libio_to_fcntl_flags - * + * * Convert RTEMS internal flags to UNIX fnctl(2) flags */ @@ -183,7 +183,7 @@ uint32_t rtems_libio_to_fcntl_flags( /* * rtems_libio_allocate * - * This routine searches the IOP Table for an unused entry. If it + * This routine searches the IOP Table for an unused entry. If it * finds one, it returns it. Otherwise, it returns NULL. */ @@ -191,7 +191,7 @@ rtems_libio_t *rtems_libio_allocate( void ) { rtems_libio_t *iop, *next; rtems_status_code rc; - + rtems_semaphore_obtain( rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT ); if (rtems_libio_iop_freelist) { @@ -211,10 +211,10 @@ rtems_libio_t *rtems_libio_allocate( void ) rtems_libio_iop_freelist = next; goto done; } - + failed: iop = 0; - + done: rtems_semaphore_release( rtems_libio_semaphore ); return iop; @@ -250,7 +250,7 @@ void rtems_libio_free( * are any active file descriptors that refer to the at least one node in the * file system that we are trying to dismount. * - * If there is at least one node in the file system referenced by the mount + * If there is at least one node in the file system referenced by the mount * table entry a 1 is returned, otherwise a 0 is returned. */ @@ -263,15 +263,15 @@ int rtems_libio_is_open_files_in_fs( int i; rtems_semaphore_obtain( rtems_libio_semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT ); - + /* * Look for any active file descriptor entry. - */ - + */ + for (iop=rtems_libio_iops,i=0; i < rtems_libio_number_iops; iop++, i++){ - + if ((iop->flags & LIBIO_FLAGS_OPEN) != 0) { - + /* * Check if this node is under the file system that we * are trying to dismount. @@ -285,7 +285,7 @@ int rtems_libio_is_open_files_in_fs( } rtems_semaphore_release( rtems_libio_semaphore ); - + return result; } @@ -294,7 +294,7 @@ int rtems_libio_is_open_files_in_fs( * * This routine scans the entire file descriptor table to determine if the * given file refers to an active file descriptor. - * + * * If the given file is open a 1 is returned, otherwise a 0 is returned. */ @@ -311,10 +311,10 @@ int rtems_libio_is_file_open( /* * Look for any active file descriptor entry. */ - - for (iop=rtems_libio_iops,i=0; i < rtems_libio_number_iops; iop++, i++){ + + for (iop=rtems_libio_iops,i=0; i < rtems_libio_number_iops; iop++, i++){ if ((iop->flags & LIBIO_FLAGS_OPEN) != 0) { - + /* * Check if this node is under the file system that we * are trying to dismount. diff --git a/cpukit/libcsupport/src/link.c b/cpukit/libcsupport/src/link.c index a22b9d988d..217342e844 100644 --- a/cpukit/libcsupport/src/link.c +++ b/cpukit/libcsupport/src/link.c @@ -76,7 +76,7 @@ int link( } result = (*parent_loc.ops->link_h)( &existing_loc, &parent_loc, name_start ); - + rtems_filesystem_freenode( &existing_loc ); rtems_filesystem_freenode( &parent_loc ); diff --git a/cpukit/libcsupport/src/lseek.c b/cpukit/libcsupport/src/lseek.c index ce114bc056..7146ae80e9 100644 --- a/cpukit/libcsupport/src/lseek.c +++ b/cpukit/libcsupport/src/lseek.c @@ -89,7 +89,7 @@ off_t lseek( #include <reent.h> -off_t _lseek_r( +off_t _lseek_r( struct _reent *ptr, int fd, off_t offset, diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c index 038cec7bc3..64d3a715e7 100644 --- a/cpukit/libcsupport/src/malloc.c +++ b/cpukit/libcsupport/src/malloc.c @@ -112,7 +112,7 @@ void RTEMS_Malloc_Initialize( /* * If the BSP is not clearing out the workspace, then it is most likely - * not clearing out the initial memory for the heap. There is no + * not clearing out the initial memory for the heap. There is no * standard supporting zeroing out the heap memory. But much code * with UNIX history seems to assume that memory malloc'ed during * initialization (before any free's) is zero'ed. This is true most @@ -145,7 +145,7 @@ void RTEMS_Malloc_Initialize( /* zero all the stats */ (void) memset( &rtems_malloc_stats, 0, sizeof(rtems_malloc_stats) ); #endif - + MSBUMP(space_available, length); } @@ -173,11 +173,11 @@ void *malloc( if (_System_state_Is_up(_System_state_Get())) { if (_Thread_Dispatch_disable_level > 0) return (void *) 0; - + if (_ISR_Nest_level > 0) return (void *) 0; } - + /* * If some free's have been deferred, then do them now. */ @@ -212,7 +212,7 @@ void *malloc( the_size = ((size + sbrk_amount) / sbrk_amount * sbrk_amount); - if ((starting_address = (void *)sbrk(the_size)) + if ((starting_address = (void *)sbrk(the_size)) == (void*) -1) return (void *) 0; @@ -226,7 +226,7 @@ void *malloc( errno = ENOMEM; return (void *) 0; } - + MSBUMP(space_available, the_size); status = rtems_region_get_segment( @@ -302,11 +302,11 @@ void *realloc( if (_System_state_Is_up(_System_state_Get())) { if (_Thread_Dispatch_disable_level > 0) return (void *) 0; - + if (_ISR_Nest_level > 0) return (void *) 0; } - + /* * Continue with calloc(). */ @@ -319,11 +319,11 @@ void *realloc( } new_area = malloc( size ); - + MSBUMP(malloc_calls, -1); /* subtract off the malloc */ /* - * There used to be a free on this error case but it is wrong to + * There used to be a free on this error case but it is wrong to * free the memory per OpenGroup Single UNIX Specification V2 * and the C Standard. */ @@ -366,7 +366,7 @@ void free( return; } } - + #ifdef MALLOC_STATS { size_t size; @@ -376,7 +376,7 @@ void free( } } #endif - + status = rtems_region_return_segment( RTEMS_Malloc_Heap, ptr ); if ( status != RTEMS_SUCCESSFUL ) { errno = EINVAL; @@ -421,7 +421,7 @@ void malloc_walk(size_t source, size_t printf_enabled) { register Region_Control *the_region; Objects_Locations location; - + _RTEMS_Lock_allocator(); /* to prevent deletion */ the_region = _Region_Get( RTEMS_Malloc_Heap, &location ); if ( location == OBJECTS_LOCAL ) @@ -437,7 +437,7 @@ void malloc_dump(void) { return; } - + void malloc_walk(size_t source, size_t printf_enabled) { return; diff --git a/cpukit/libcsupport/src/mknod.c b/cpukit/libcsupport/src/mknod.c index 72b332a40b..c786c6d756 100644 --- a/cpukit/libcsupport/src/mknod.c +++ b/cpukit/libcsupport/src/mknod.c @@ -3,7 +3,7 @@ * * This routine is not defined in the POSIX 1003.1b standard but is * commonly supported on most UNIX and POSIX systems. It is the - * foundation for creating file system objects. + * foundation for creating file system objects. * * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). @@ -42,7 +42,7 @@ int mknod( if ( !(mode & (S_IFREG|S_IFCHR|S_IFBLK|S_IFIFO) ) ) rtems_set_errno_and_return_minus_one( EINVAL ); - + if ( S_ISFIFO(mode) ) rtems_set_errno_and_return_minus_one( ENOTSUP ); @@ -52,9 +52,9 @@ int mknod( rtems_set_errno_and_return_minus_one( ENOTSUP ); } - result = (*temp_loc.ops->evalformake_h)( + result = (*temp_loc.ops->evalformake_h)( &pathname[i], - &temp_loc, + &temp_loc, &name_start ); if ( result != 0 ) diff --git a/cpukit/libcsupport/src/mount.c b/cpukit/libcsupport/src/mount.c index 01ea2ea7cb..bec64eb701 100644 --- a/cpukit/libcsupport/src/mount.c +++ b/cpukit/libcsupport/src/mount.c @@ -3,8 +3,8 @@ * * XXX * - * XXX make sure no required ops are NULL - * XXX make sure no optional ops you are using are NULL + * XXX make sure no required ops are NULL + * XXX make sure no optional ops you are using are NULL * XXX unmount should be required. * * COPYRIGHT (c) 1989-1999. @@ -55,8 +55,8 @@ static int Is_node_fs_root( /* * mount * - * This routine will attempt to mount a new file system at the specified - * mount point. A series of tests will be run to determine if any of the + * This routine will attempt to mount a new file system at the specified + * mount point. A series of tests will be run to determine if any of the * following reasons exist to prevent the mount operation: * * 1) The file system type or options are not valid @@ -95,7 +95,7 @@ int mount( * Are the file system options valid? */ - if ( options != RTEMS_FILESYSTEM_READ_ONLY && + if ( options != RTEMS_FILESYSTEM_READ_ONLY && options != RTEMS_FILESYSTEM_READ_WRITE ) { errno = EINVAL; return -1; @@ -109,7 +109,7 @@ int mount( /* - * Allocate a mount table entry + * Allocate a mount table entry */ size = sizeof(rtems_filesystem_mount_table_entry_t); @@ -133,12 +133,12 @@ int mount( /* * The mount_point should be a directory with read/write/execute - * permissions in the existing tree. + * permissions in the existing tree. */ if ( mount_point ) { - if ( rtems_filesystem_evaluate_path( + if ( rtems_filesystem_evaluate_path( mount_point, RTEMS_LIBIO_PERMS_RWX, &loc, TRUE ) == -1 ) goto cleanup_and_bail; @@ -153,12 +153,12 @@ int mount( goto cleanup_and_bail; } - /* + /* * Test to see if it is a directory */ if ( loc.ops->node_type_h( &loc ) != RTEMS_FILESYSTEM_DIRECTORY ) { - errno = ENOTDIR; + errno = ENOTDIR; goto cleanup_and_bail; } @@ -170,11 +170,11 @@ int mount( errno = EBUSY; goto cleanup_and_bail; } - + /* * This must be a good mount point, so move the location information * into the allocated mount entry. Note: the information that - * may have been allocated in loc should not be sent to freenode + * may have been allocated in loc should not be sent to freenode * until the system is unmounted. It may be needed to correctly * traverse the tree. */ @@ -184,9 +184,9 @@ int mount( temp_mt_entry->mt_point_node.ops = loc.ops; temp_mt_entry->mt_point_node.mt_entry = loc.mt_entry; - /* - * This link to the parent is only done when we are dealing with system - * below the base file system + /* + * This link to the parent is only done when we are dealing with system + * below the base file system */ if ( !loc.ops->mount_h ){ @@ -199,9 +199,9 @@ int mount( } } else { - /* - * This is a mount of the base file system --> The - * mt_point_node.node_access will be set to null to indicate that this + /* + * This is a mount of the base file system --> The + * mt_point_node.node_access will be set to null to indicate that this * is the root of the entire file system. */ @@ -224,7 +224,7 @@ int mount( } /* - * Add the mount table entry to the mount table chain + * Add the mount table entry to the mount table chain */ Chain_Append( &rtems_filesystem_mount_table_control, &temp_mt_entry->Node ); @@ -236,7 +236,7 @@ int mount( cleanup_and_bail: free( temp_mt_entry ); - + if ( loc_to_free ) rtems_filesystem_freenode( loc_to_free ); @@ -264,7 +264,7 @@ int init_fs_mount_table() * This routine will run through the entries that currently exist in the * mount table chain. For each entry in the mount table chain it will * compare the mount tables root node to the node describing the selected - * mount point. If any match is found true is returned else false is + * mount point. If any match is found true is returned else false is * returned. * */ @@ -276,8 +276,8 @@ static int Is_node_fs_root( Chain_Node *the_node; rtems_filesystem_mount_table_entry_t *the_mount_entry; - /* - * For each mount table entry + /* + * For each mount table entry */ for ( the_node = rtems_filesystem_mount_table_control.first; diff --git a/cpukit/libcsupport/src/newlibc.c b/cpukit/libcsupport/src/newlibc.c index b9ba3f8355..ef151c6e81 100644 --- a/cpukit/libcsupport/src/newlibc.c +++ b/cpukit/libcsupport/src/newlibc.c @@ -41,11 +41,11 @@ * we just don't for now. * Not sure if this is a problem with hpux, newlib, or something else. */ - + #if defined(RTEMS_UNIX) && !defined(hpux) #define NEED_SETVBUF #endif - + #include <stdio.h> int _fwalk(struct _reent *ptr, int (*function) (FILE *) ); @@ -65,7 +65,7 @@ extern void _reclaim_reent(struct _reent *); void libc_wrapup(void) { /* - * In case RTEMS is already down, don't do this. It could be + * In case RTEMS is already down, don't do this. It could be * dangerous. */ @@ -87,7 +87,7 @@ void libc_wrapup(void) #endif _REENT = &libc_global_reent; } - + /* * Try to drain output buffers. * @@ -100,7 +100,7 @@ void libc_wrapup(void) fclose (stderr); } -/* +/* * reent struct allocation moved here from libc_start_hook() to avoid * mutual exclusion problems when memory is allocated from the start hook. * @@ -129,14 +129,14 @@ rtems_boolean libc_create_hook( #endif if (ptr) - { - + { + #ifdef __GNUC__ /* GCC extension: structure constants */ _REENT_INIT_PTR((ptr)); #else - /* - * WARNING: THIS IS VERY DEPENDENT ON NEWLIB!!! + /* + * WARNING: THIS IS VERY DEPENDENT ON NEWLIB!!! * Last visual check was against newlib 1.8.2 but last known * use was against 1.7.0. This is basically an exansion of * REENT_INIT() in <sys/reent.h>. @@ -171,7 +171,7 @@ rtems_extension libc_start_hook( /* * Called for all user TASKS (system tasks are MPCI Receive Server and IDLE) */ - + #ifdef NEED_SETVBUF rtems_extension libc_begin_hook(rtems_tcb *current_task) { @@ -248,7 +248,7 @@ rtems_extension libc_delete_hook( */ /* * Just in case there are some buffers lying around. - */ + */ _fwalk(ptr, newlib_free_buffers); #if REENT_MALLOCED free(ptr); diff --git a/cpukit/libcsupport/src/no_posix.c b/cpukit/libcsupport/src/no_posix.c index 37577ebfe5..1b3bf35c21 100644 --- a/cpukit/libcsupport/src/no_posix.c +++ b/cpukit/libcsupport/src/no_posix.c @@ -52,10 +52,10 @@ int __kill( pid_t pid, int sig ) * 3.4.3 Delay Process Execution, P1003.1b-1993, p. 81 * * $Id$ - */ + */ #include <time.h> -#include <unistd.h> +#include <unistd.h> #include <rtems.h> diff --git a/cpukit/libcsupport/src/open.c b/cpukit/libcsupport/src/open.c index 5ecb48175d..66c5367f76 100644 --- a/cpukit/libcsupport/src/open.c +++ b/cpukit/libcsupport/src/open.c @@ -36,10 +36,10 @@ * EINTR - The open( operation was interrupted by a signal. * EINVAL - This implementation does not support synchronized IO for this * file. - * EISDIR - The named file is a directory and the flags argument + * EISDIR - The named file is a directory and the flags argument * specified write or read/write access. * EMFILE - Too many file descriptors are in used by this process. - * ENAMETOOLONG - + * ENAMETOOLONG - * The length of the path exceeds PATH_MAX or a pathname * component is longer than NAME_MAX while POSIX_NO_TRUNC * is in effect. @@ -74,7 +74,7 @@ int open( /* - * Set the Evaluation flags + * Set the Evaluation flags */ eval_flags = 0; @@ -84,7 +84,7 @@ int open( if ( ( status & _FWRITE ) == _FWRITE ) eval_flags |= RTEMS_LIBIO_PERMS_WRITE; - + va_start(ap, flags); mode = va_arg( ap, int ); @@ -160,7 +160,7 @@ int open( if ( !iop->handlers->open_h ) { rc = ENOTSUP; - goto done; + goto done; } rc = (*iop->handlers->open_h)( iop, pathname, flags, mode ); @@ -180,7 +180,7 @@ int open( loc_to_free = NULL; } } - + /* * Single exit and clean up path. */ diff --git a/cpukit/libcsupport/src/opendir.c b/cpukit/libcsupport/src/opendir.c index eef211dcbc..98129bc294 100644 --- a/cpukit/libcsupport/src/opendir.c +++ b/cpukit/libcsupport/src/opendir.c @@ -3,7 +3,7 @@ * * This was copied from Newlib 1.8.0. * - * + * * Copyright (c) 1983 Regents of the University of California. * All rights reserved. * diff --git a/cpukit/libcsupport/src/printk.c b/cpukit/libcsupport/src/printk.c index fdac110456..2db31f0bd9 100644 --- a/cpukit/libcsupport/src/printk.c +++ b/cpukit/libcsupport/src/printk.c @@ -31,7 +31,7 @@ | Description: print number in a given base. | Global Variables: None. | Arguments: num - number to print, base - base used to print the number. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ static void printNum(long unsigned int num, int base, int sign, int maxwidth, int lead) @@ -45,7 +45,7 @@ printNum(long unsigned int num, int base, int sign, int maxwidth, int lead) num = -num; if (maxwidth) maxwidth--; } - + count = 0; while ((n = num / base) > 0) { toPrint[count++] = (num - (n*base)); @@ -70,7 +70,7 @@ printNum(long unsigned int num, int base, int sign, int maxwidth, int lead) console is not yet initialized or in ISR's. | Global Variables: None. | Arguments: as in printf: fmt - format string, ... - unnamed arguments. -| Returns: Nothing. +| Returns: Nothing. +--------------------------------------------------------------------------*/ void vprintk(char *fmt, va_list ap) @@ -80,7 +80,7 @@ vprintk(char *fmt, va_list ap) /* unsigned int level; */ /* _CPU_ISR_Disable(level); */ - + for (; *fmt != '\0'; fmt++) { lflag = 0; @@ -114,7 +114,7 @@ vprintk(char *fmt, va_list ap) case 'u': case 'U': base = 10; sign = 0; break; case 'x': case 'X': base = 16; sign = 0; break; case 's': - for (str = va_arg(ap, char *); *str; str++) + for (str = va_arg(ap, char *); *str; str++) BSP_output_char(*str); break; case 'c': @@ -150,7 +150,7 @@ void printk(char *fmt, ...) { va_list ap; /* points to each unnamed argument in turn */ - + va_start(ap, fmt); /* make ap point to 1st unnamed arg */ vprintk(fmt, ap); va_end(ap); /* clean up when done */ diff --git a/cpukit/libcsupport/src/privateenv.c b/cpukit/libcsupport/src/privateenv.c index 4e6ee84107..e1a5e674e3 100644 --- a/cpukit/libcsupport/src/privateenv.c +++ b/cpukit/libcsupport/src/privateenv.c @@ -38,7 +38,7 @@ free_user_env(void *venv) { rtems_user_env_t *env = (rtems_user_env_t*) venv ; - if (env != &rtems_global_user_env + if (env != &rtems_global_user_env #ifdef HAVE_USERENV_REFCNT && --env->refcnt <= 0 #endif @@ -76,11 +76,11 @@ rtems_status_code rtems_libio_set_private_env(void) { return sc; } rtems_current_user_env = tmp; - }; + }; *rtems_current_user_env = rtems_global_user_env; /* get the global values*/ rtems_current_user_env->task_id=task_id; /* mark the local values*/ - + /* get a clean root */ rtems_filesystem_root = THE_ROOT_FS_LOC; @@ -127,11 +127,11 @@ rtems_status_code rtems_libio_share_private_env(rtems_id task_id) { if (sc != RTEMS_SUCCESSFUL) return sc; if (rtems_current_user_env->task_id==current_task_id) { - /* kill the current user env & task_var*/ + /* kill the current user env & task_var*/ rtems_user_env_t *tmp = rtems_current_user_env; sc = rtems_task_variable_delete(RTEMS_SELF,(void*)&rtems_current_user_env); if (sc != RTEMS_SUCCESSFUL) return sc; - free_user_env(tmp); + free_user_env(tmp); }; /* AT THIS POINT, rtems_current_user_env is DANGLING */ @@ -144,7 +144,7 @@ rtems_status_code rtems_libio_share_private_env(rtems_id task_id) { sc = rtems_task_variable_add(RTEMS_SELF,(void*)&rtems_current_user_env,free_user_env); if (sc != RTEMS_SUCCESSFUL) goto bailout; - + /* the current_user_env is the same pointer that remote env */ rtems_current_user_env = shared_user_env; diff --git a/cpukit/libcsupport/src/readdir.c b/cpukit/libcsupport/src/readdir.c index 8b54a9401b..bcff3d951a 100644 --- a/cpukit/libcsupport/src/readdir.c +++ b/cpukit/libcsupport/src/readdir.c @@ -3,7 +3,7 @@ * * This was copied from Newlib 1.8.0. * - * + * * Copyright (c) 1983 Regents of the University of California. * All rights reserved. * @@ -59,7 +59,7 @@ struct dirent * readdir(dirp) register DIR *dirp; { register struct dirent *dp; - + if ( !dirp ) return NULL; @@ -68,7 +68,7 @@ register DIR *dirp; { dirp->dd_size = getdents (dirp->dd_fd, dirp->dd_buf, dirp->dd_len); - + if (dirp->dd_size <= 0) return NULL; } diff --git a/cpukit/libcsupport/src/readlink.c b/cpukit/libcsupport/src/readlink.c index a25ab39312..f2ec9781c5 100644 --- a/cpukit/libcsupport/src/readlink.c +++ b/cpukit/libcsupport/src/readlink.c @@ -33,7 +33,7 @@ int readlink( result = rtems_filesystem_evaluate_path( pathname, 0, &loc, FALSE ); if ( result != 0 ) return -1; - + if ( !loc.ops->node_type_h ){ rtems_filesystem_freenode( &loc ); rtems_set_errno_and_return_minus_one( ENOTSUP ); @@ -52,6 +52,6 @@ int readlink( result = (*loc.ops->readlink_h)( &loc, buf, bufsize ); rtems_filesystem_freenode( &loc ); - + return result; } diff --git a/cpukit/libcsupport/src/rewinddir.c b/cpukit/libcsupport/src/rewinddir.c index f25117782e..f4542d2db6 100644 --- a/cpukit/libcsupport/src/rewinddir.c +++ b/cpukit/libcsupport/src/rewinddir.c @@ -31,7 +31,7 @@ void rewinddir( return; status = lseek( dirp->dd_fd, 0, SEEK_SET ); - + if( status == -1 ) return; diff --git a/cpukit/libcsupport/src/rmdir.c b/cpukit/libcsupport/src/rmdir.c index e0ca5956be..59d43ff278 100644 --- a/cpukit/libcsupport/src/rmdir.c +++ b/cpukit/libcsupport/src/rmdir.c @@ -68,9 +68,9 @@ int rmdir( rtems_set_errno_and_return_minus_one( ENOTSUP ); } - result = (*loc.handlers->rmnod_h)( &loc ); + result = (*loc.handlers->rmnod_h)( &loc ); rtems_filesystem_freenode( &loc ); - + return result; } diff --git a/cpukit/libcsupport/src/scandir.c b/cpukit/libcsupport/src/scandir.c index e8ef3212d5..a17c070cc9 100644 --- a/cpukit/libcsupport/src/scandir.c +++ b/cpukit/libcsupport/src/scandir.c @@ -3,7 +3,7 @@ * * This was copied from Newlib 1.8.0. * - * + * * Copyright (c) 1983 Regents of the University of California. * All rights reserved. * @@ -99,7 +99,7 @@ scandir(dirname, namelist, select, dcomp) /* * estimate the array size by taking the size of the directory file - * and dividing it by a multiple of the minimum size entry. + * and dividing it by a multiple of the minimum size entry. */ arraysz = (stb.st_size / 24); names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *)); @@ -145,7 +145,7 @@ cleanup_and_bail: if ( dirp ) closedir( dirp ); - + if ( names ) { for (i=0; i < nitems; i++ ) free( names[i] ); diff --git a/cpukit/libcsupport/src/seekdir.c b/cpukit/libcsupport/src/seekdir.c index 6ea898b95f..be96bb50d3 100644 --- a/cpukit/libcsupport/src/seekdir.c +++ b/cpukit/libcsupport/src/seekdir.c @@ -37,7 +37,7 @@ void seekdir( * This is not a nice way to error out, but we have no choice here. */ - if ( status == -1 ) + if ( status == -1 ) return; dirp->dd_loc = 0; diff --git a/cpukit/libcsupport/src/stat.c b/cpukit/libcsupport/src/stat.c index 9218ca96d1..a39deda79e 100644 --- a/cpukit/libcsupport/src/stat.c +++ b/cpukit/libcsupport/src/stat.c @@ -62,7 +62,7 @@ int _STAT_NAME( status = rtems_filesystem_evaluate_path( path, 0, &loc, _STAT_FOLLOW_LINKS ); if ( status != 0 ) return -1; - + if ( !loc.handlers->fstat_h ){ rtems_filesystem_freenode( &loc ); rtems_set_errno_and_return_minus_one( ENOTSUP ); @@ -78,7 +78,7 @@ int _STAT_NAME( status = (*loc.handlers->fstat_h)( &loc, buf ); rtems_filesystem_freenode( &loc ); - + return status; } #endif diff --git a/cpukit/libcsupport/src/telldir.c b/cpukit/libcsupport/src/telldir.c index aaf6f3a137..d7b9f23b4d 100644 --- a/cpukit/libcsupport/src/telldir.c +++ b/cpukit/libcsupport/src/telldir.c @@ -1,13 +1,13 @@ /* * telldir() - XXX - * + * * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). - * + * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. - * + * */ #if HAVE_CONFIG_H @@ -31,7 +31,7 @@ long telldir( rtems_libio_t *iop; if ( !dirp ) - rtems_set_errno_and_return_minus_one( EBADF ); + rtems_set_errno_and_return_minus_one( EBADF ); /* * Get the file control block structure associated with the diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c index 7040846cca..045f4003ab 100644 --- a/cpukit/libcsupport/src/termios.c +++ b/cpukit/libcsupport/src/termios.c @@ -236,7 +236,7 @@ rtems_termios_open ( rtems_build_name ('T', 'x', 'T', c), TERMIOS_TXTASK_PRIO, TERMIOS_TXTASK_STACKSIZE, - RTEMS_NO_PREEMPT | RTEMS_NO_TIMESLICE | + RTEMS_NO_PREEMPT | RTEMS_NO_TIMESLICE | RTEMS_NO_ASR, RTEMS_NO_FLOATING_POINT | RTEMS_LOCAL, &tty->txTaskId); @@ -246,13 +246,13 @@ rtems_termios_open ( rtems_build_name ('R', 'x', 'T', c), TERMIOS_RXTASK_PRIO, TERMIOS_RXTASK_STACKSIZE, - RTEMS_NO_PREEMPT | RTEMS_NO_TIMESLICE | + RTEMS_NO_PREEMPT | RTEMS_NO_TIMESLICE | RTEMS_NO_ASR, RTEMS_NO_FLOATING_POINT | RTEMS_LOCAL, &tty->rxTaskId); if (sc != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred (sc); - + } if ((tty->device.pollRead == NULL) || (tty->device.outputUsesInterrupts == TERMIOS_TASK_DRIVEN)){ @@ -316,7 +316,7 @@ rtems_termios_open ( (rtems_task_argument)tty); if (sc != RTEMS_SUCCESSFUL) rtems_fatal_error_occurred (sc); - + sc = rtems_task_start(tty->txTaskId, rtems_termios_txdaemon, (rtems_task_argument)tty); @@ -376,8 +376,8 @@ rtems_termios_close (void *arg) */ drainOutput (tty); } - - if (tty->device.outputUsesInterrupts + + if (tty->device.outputUsesInterrupts == TERMIOS_TASK_DRIVEN) { /* * send "terminate" to I/O tasks @@ -440,12 +440,12 @@ rtems_status_code rtems_termios_bufsize ( return RTEMS_SUCCESSFUL; } -static void +static void termios_set_flowctrl(struct rtems_termios_tty *tty) { rtems_interrupt_level level; - /* - * check for flow control options to be switched off + /* + * check for flow control options to be switched off */ /* check for outgoing XON/XOFF flow control switched off */ @@ -483,17 +483,17 @@ termios_set_flowctrl(struct rtems_termios_tty *tty) !(tty->termios.c_cflag & CRTSCTS)) { /* clear related flags in flow_ctrl */ tty->flow_ctrl &= ~(FL_MDRTS); - + /* restart remote Tx, if it was stopped */ if ((tty->flow_ctrl & FL_IRTSOFF) && (tty->device.startRemoteTx != NULL)) { tty->device.startRemoteTx(tty->minor); } tty->flow_ctrl &= ~(FL_IRTSOFF); - } - - /* - * check for flow control options to be switched on + } + + /* + * check for flow control options to be switched on */ /* check for incoming RTS/CTS flow control switched on */ if (tty->termios.c_cflag & CRTSCTS) { @@ -608,9 +608,9 @@ rtems_termios_ioctl (void *arg) sc = linesw[tty->t_line].l_open(tty); } break; - case TIOCGETD: + case TIOCGETD: *(int*)(args->buffer)=tty->t_line; - break; + break; #endif case FIONREAD: /* Half guess that this is the right operation */ @@ -672,7 +672,7 @@ rtems_termios_puts (const char *buf, int len, struct rtems_termios_tty *tty) } else { /* remember that output has been stopped due to flow ctrl*/ - tty->flow_ctrl |= FL_OSTOP; + tty->flow_ctrl |= FL_OSTOP; } tty->rawOutBufState = rob_busy; } @@ -1031,12 +1031,12 @@ fillBufferQueue (struct rtems_termios_tty *tty) && ((tty->rawOutBufState == rob_idle) || (tty->flow_ctrl & FL_OSTOP))) { /* XON should be sent now... */ - (*tty->device.write)(tty->minor, + (*tty->device.write)(tty->minor, &(tty->termios.c_cc[VSTART]), 1); } - else if (tty->flow_ctrl & FL_MDRTS) { - tty->flow_ctrl &= ~FL_IRTSOFF; + else if (tty->flow_ctrl & FL_MDRTS) { + tty->flow_ctrl &= ~FL_IRTSOFF; /* activate RTS line */ if (tty->device.startRemoteTx != NULL) { tty->device.startRemoteTx(tty->minor); @@ -1144,7 +1144,7 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len) c = *buf++; linesw[tty->t_line].l_rint(c,tty); } - + /* * check to see if rcv wakeup callback was set */ @@ -1159,7 +1159,7 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len) c = *buf++; /* FIXME: implement IXANY: any character restarts output */ /* if incoming XON/XOFF controls outgoing stream: */ - if (tty->flow_ctrl & FL_MDXON) { + if (tty->flow_ctrl & FL_MDXON) { /* if received char is V_STOP and V_START (both are equal value) */ if (c == tty->termios.c_cc[VSTOP]) { if (c == tty->termios.c_cc[VSTART]) { @@ -1196,20 +1196,20 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len) /* reenable interrupts */ rtems_interrupt_enable(level); } - } + } else { newTail = (tty->rawInBuf.Tail + 1) % tty->rawInBuf.Size; /* if chars_in_buffer > highwater */ rtems_interrupt_disable(level); if ((((newTail - tty->rawInBuf.Head + tty->rawInBuf.Size) % tty->rawInBuf.Size) - > tty->highwater) && + > tty->highwater) && !(tty->flow_ctrl & FL_IREQXOF)) { /* incoming data stream should be stopped */ - tty->flow_ctrl |= FL_IREQXOF; - if ((tty->flow_ctrl & (FL_MDXOF | FL_ISNTXOF)) + tty->flow_ctrl |= FL_IREQXOF; + if ((tty->flow_ctrl & (FL_MDXOF | FL_ISNTXOF)) == (FL_MDXOF ) ){ - if ((tty->flow_ctrl & FL_OSTOP) || + if ((tty->flow_ctrl & FL_OSTOP) || (tty->rawOutBufState == rob_idle)) { /* if tx is stopped due to XOFF or out of data */ /* call write function here */ @@ -1219,9 +1219,9 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len) 1); } } - else if ((tty->flow_ctrl & (FL_MDRTS | FL_IRTSOFF)) + else if ((tty->flow_ctrl & (FL_MDRTS | FL_IRTSOFF)) == (FL_MDRTS ) ) { - tty->flow_ctrl |= FL_IRTSOFF; + tty->flow_ctrl |= FL_IRTSOFF; /* deactivate RTS line */ if (tty->device.stopRemoteTx != NULL) { tty->device.stopRemoteTx(tty->minor); @@ -1237,7 +1237,7 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len) else { tty->rawInBuf.theBuf[newTail] = c; tty->rawInBuf.Tail = newTail; - + /* * check to see if rcv wakeup callback was set */ @@ -1245,7 +1245,7 @@ rtems_termios_enqueue_raw_characters (void *ttyp, char *buf, int len) (*tty->tty_rcv.sw_pfn)(&tty->termios, tty->tty_rcv.sw_arg); tty->tty_rcvwakeup = 1; } - } + } } } tty->rawInBufDropped += dropped; @@ -1269,7 +1269,7 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) if ((tty->flow_ctrl & (FL_MDXOF | FL_IREQXOF | FL_ISNTXOF)) == (FL_MDXOF | FL_IREQXOF)) { /* XOFF should be sent now... */ - (*tty->device.write)(tty->minor, + (*tty->device.write)(tty->minor, &(tty->termios.c_cc[VSTOP]), 1); rtems_interrupt_disable(level); @@ -1284,12 +1284,12 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) /* NOTE: send XON even, if no longer in XON/XOFF mode... */ /* XON should be sent now... */ /* - * FIXME: this .write call will generate another + * FIXME: this .write call will generate another * dequeue callback. This will advance the "Tail" in the data * buffer, although the corresponding data is not yet out! * Therefore the dequeue "length" should be reduced by 1 */ - (*tty->device.write)(tty->minor, + (*tty->device.write)(tty->minor, &(tty->termios.c_cc[VSTART]), 1); rtems_interrupt_disable(level); @@ -1305,12 +1305,12 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) * buffer was empty */ if (tty->rawOutBufState == rob_wait) { - /* - * this should never happen... + /* + * this should never happen... */ rtems_semaphore_release (tty->rawOutBuf.Semaphore); } - return 0; + return 0; } rtems_interrupt_disable(level); @@ -1321,7 +1321,7 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) newTail = (tty->rawOutBuf.Tail + len) % tty->rawOutBuf.Size; tty->rawOutBuf.Tail = newTail; if (tty->rawOutBufState == rob_wait) { - /* + /* * wake up any pending writer task */ rtems_semaphore_release (tty->rawOutBuf.Semaphore); @@ -1332,7 +1332,7 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) */ tty->rawOutBufState = rob_idle; nToSend = 0; - + /* * check to see if snd wakeup callback was set */ @@ -1341,7 +1341,7 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) } } /* check, whether output should stop due to received XOFF */ - else if ((tty->flow_ctrl & (FL_MDXON | FL_ORCVXOF)) + else if ((tty->flow_ctrl & (FL_MDXON | FL_ORCVXOF)) == (FL_MDXON | FL_ORCVXOF)) { /* Buffer not empty, but output stops due to XOFF */ /* set flag, that output has been stopped */ @@ -1366,8 +1366,8 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) nToSend = 1; } tty->rawOutBufState = rob_busy; /*apm*/ - (*tty->device.write)(tty->minor, - (char *)&tty->rawOutBuf.theBuf[newTail], + (*tty->device.write)(tty->minor, + (char *)&tty->rawOutBuf.theBuf[newTail], nToSend); } tty->rawOutBuf.Tail = newTail; /*apm*/ @@ -1381,7 +1381,7 @@ rtems_termios_refill_transmitter (struct rtems_termios_tty *tty) * device transmit interrupt handler. * The second argument is the number of characters transmitted so far. * This value will always be 1 for devices which generate an interrupt - * for each transmitted character. + * for each transmitted character. * It returns number of characters left to transmit */ int @@ -1431,7 +1431,7 @@ static rtems_task rtems_termios_txdaemon(rtems_task_argument argument) /* * wait for rtems event */ - rtems_event_receive((TERMIOS_TX_START_EVENT | + rtems_event_receive((TERMIOS_TX_START_EVENT | TERMIOS_TX_TERMINATE_EVENT), RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, @@ -1468,7 +1468,7 @@ static rtems_task rtems_termios_rxdaemon(rtems_task_argument argument) /* * wait for rtems event */ - rtems_event_receive((TERMIOS_RX_PROC_EVENT | + rtems_event_receive((TERMIOS_RX_PROC_EVENT | TERMIOS_RX_TERMINATE_EVENT), RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, diff --git a/cpukit/libcsupport/src/unixlibc.c b/cpukit/libcsupport/src/unixlibc.c index 39db95da5a..67d2d4f509 100644 --- a/cpukit/libcsupport/src/unixlibc.c +++ b/cpukit/libcsupport/src/unixlibc.c @@ -41,7 +41,7 @@ void libc_init(int reentrant) } #else - + /* remove ANSI errors. * A program must contain at least one external-declaration * (X3.159-1989 p.82,L3). diff --git a/cpukit/libcsupport/src/unlink.c b/cpukit/libcsupport/src/unlink.c index 5494b707b6..5b5f17c02a 100644 --- a/cpukit/libcsupport/src/unlink.c +++ b/cpukit/libcsupport/src/unlink.c @@ -20,8 +20,8 @@ #include <rtems/libio_.h> #include <rtems/seterr.h> -int unlink( - const char *path +int unlink( + const char *path ) { rtems_filesystem_location_info_t loc; @@ -34,7 +34,7 @@ int unlink( result = rtems_filesystem_evaluate_path( path, 0, &loc, FALSE ); if ( result != 0 ) return -1; - + result = rtems_filesystem_evaluate_parent(RTEMS_LIBIO_PERMS_WRITE, &loc ); if (result != 0){ rtems_filesystem_freenode( &loc ); @@ -59,7 +59,7 @@ int unlink( result = (*loc.ops->unlink_h)( &loc ); rtems_filesystem_freenode( &loc ); - + return result; } diff --git a/cpukit/libcsupport/src/unmount.c b/cpukit/libcsupport/src/unmount.c index 50566fb0f0..f37d3f2e56 100644 --- a/cpukit/libcsupport/src/unmount.c +++ b/cpukit/libcsupport/src/unmount.c @@ -1,7 +1,7 @@ /* * unmount() - Unmount a File System * - * This routine is not defined in the POSIX 1003.1b standard but + * This routine is not defined in the POSIX 1003.1b standard but * in some form is supported on most UNIX and POSIX systems. This * routine is necessary to mount instantiations of a file system * into the file system name space. @@ -43,7 +43,7 @@ int search_mt_for_mount_point( rtems_filesystem_location_info_t *location_of_mount_point ); -rtems_boolean rtems_filesystem_nodes_equal( +rtems_boolean rtems_filesystem_nodes_equal( const rtems_filesystem_location_info_t *loc1, const rtems_filesystem_location_info_t *loc2 ){ @@ -59,11 +59,11 @@ rtems_boolean rtems_filesystem_nodes_equal( * compare the mount tables mt_fs_root to the new_fs_root_node. If any of the * mount table file system root nodes matches the new file system root node * this indicates that we are trying to mount a file system that has already - * been mounted. This is not a permitted operation. temp_loc is set to + * been mounted. This is not a permitted operation. temp_loc is set to * the root node of the file system being unmounted. */ -rtems_boolean file_systems_below_this_mountpoint( +rtems_boolean file_systems_below_this_mountpoint( const char *path, rtems_filesystem_location_info_t *fs_root_loc, rtems_filesystem_mount_table_entry_t *fs_to_unmount @@ -91,7 +91,7 @@ rtems_boolean file_systems_below_this_mountpoint( /* * unmount - * + * * This routine will attempt to unmount the file system that has been * is mounted a path. If the operation is successful, 0 will * be returned to the calling routine. Otherwise, 1 will be returned. @@ -119,7 +119,7 @@ int unmount( mt_entry = loc.mt_entry; fs_mount_loc = &mt_entry->mt_point_node; fs_root_loc = &mt_entry->mt_fs_root; - + /* * Verify this is the root node for the file system to be unmounted. */ @@ -167,12 +167,12 @@ int unmount( /* * Run the file descriptor table to determine if there are any file * descriptors that are currently active and reference nodes in the - * file system that we are trying to unmount + * file system that we are trying to unmount */ - if ( rtems_libio_is_open_files_in_fs( mt_entry ) == 1 ) + if ( rtems_libio_is_open_files_in_fs( mt_entry ) == 1 ) rtems_set_errno_and_return_minus_one( EBUSY ); - + /* * Allow the file system being unmounted on to do its cleanup. * If it fails it will set the errno to the approprate value @@ -191,7 +191,7 @@ int unmount( * directory node. * * NOTE: Fatal error is called in a case which should never happen - * This was response was questionable but the best we could + * This was response was questionable but the best we could * come up with. */ diff --git a/cpukit/libcsupport/src/utsname.c b/cpukit/libcsupport/src/utsname.c index fe3fecac9f..cc114434bf 100644 --- a/cpukit/libcsupport/src/utsname.c +++ b/cpukit/libcsupport/src/utsname.c @@ -46,7 +46,7 @@ int uname( strcpy( name->release, RTEMS_VERSION ); strcpy( name->version, "" ); - + sprintf( name->machine, "%s/%s", CPU_NAME, CPU_MODEL_NAME ); return 0; diff --git a/cpukit/libcsupport/src/write.c b/cpukit/libcsupport/src/write.c index 2e10835efe..4e08918ffb 100644 --- a/cpukit/libcsupport/src/write.c +++ b/cpukit/libcsupport/src/write.c @@ -20,7 +20,7 @@ /* * write - * + * * This routine writes count bytes from from buffer pointed to by buffer * to the file associated with the open file descriptor, fildes. */ |