diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-20 02:34:57 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-20 02:34:57 +0000 |
| commit | 5c1001ce4f585836e1f83c28d1df89aee42fb743 (patch) | |
| tree | 5967e9ca7d44ed1d2823be9746817ebb8e025f5d /apps | |
| parent | 2ae14b2b85ad813a269e8a5529aa76cf984fa8a5 (diff) | |
| download | ATCD-5c1001ce4f585836e1f83c28d1df89aee42fb743.tar.gz | |
changed include protection from #if !defined to ifndef, and added #pragma once, if possible
Diffstat (limited to 'apps')
165 files changed, 1318 insertions, 1016 deletions
diff --git a/apps/Gateway/Gateway/Concrete_Connection_Handlers.h b/apps/Gateway/Gateway/Concrete_Connection_Handlers.h index ca36e3f517e..b149856de05 100644 --- a/apps/Gateway/Gateway/Concrete_Connection_Handlers.h +++ b/apps/Gateway/Gateway/Concrete_Connection_Handlers.h @@ -5,7 +5,7 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Concrete_Connection_Handlers.h // @@ -14,11 +14,11 @@ // appropriate threaded/reactive Consumer/Supplier behavior. // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (CONCRETE_CONNECTION_HANDLER) +#ifndef CONCRETE_CONNECTION_HANDLER #define CONCRETE_CONNECTION_HANDLER #include "Connection_Handler.h" @@ -69,8 +69,8 @@ public: // = Initialization method. Consumer_Handler (const Connection_Config_Info &); - virtual int put (ACE_Message_Block *event, - ACE_Time_Value * = 0); + virtual int put (ACE_Message_Block *event, + ACE_Time_Value * = 0); // Send an event to a Consumer (may be queued if necessary). protected: diff --git a/apps/Gateway/Gateway/Config_Files.h b/apps/Gateway/Gateway/Config_Files.h index 1e23006ddbd..9fd96b687f6 100644 --- a/apps/Gateway/Gateway/Config_Files.h +++ b/apps/Gateway/Gateway/Config_Files.h @@ -5,16 +5,16 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Config_Files.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (_CONFIG_FILES) +#ifndef _CONFIG_FILES #define _CONFIG_FILES #include "File_Parser.h" @@ -42,7 +42,7 @@ public: ACE_INT32 max_retry_timeout_; // Maximum amount of time to wait for reconnecting. - + u_short local_port_; // Our local port number. @@ -80,10 +80,10 @@ public: ACE_INT32 consumers_[MAX_CONSUMERS]; // Connection ids for consumers that will be routed information // containing this <connection_id_> - + ACE_INT32 total_consumers_; // Total number of these consumers. -}; +}; class Consumer_Config_File_Parser : public File_Parser<Consumer_Config_Info> // = TITLE diff --git a/apps/Gateway/Gateway/Connection_Handler.h b/apps/Gateway/Gateway/Connection_Handler.h index 876f69d97f4..3003a81874e 100644 --- a/apps/Gateway/Gateway/Connection_Handler.h +++ b/apps/Gateway/Gateway/Connection_Handler.h @@ -5,19 +5,24 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Connection_Handler.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (_CONNECTION_HANDLER) +#ifndef _CONNECTION_HANDLER #define _CONNECTION_HANDLER #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Connector.h" #include "ace/Svc_Handler.h" #include "Config_Files.h" @@ -54,7 +59,7 @@ public: CONNECTING, // During connection establishment. ESTABLISHED, // Connection_Handler is established and active. DISCONNECTING, // Connection_Handler is in the process of connecting. - FAILED // Connection_Handler has failed. + FAILED // Connection_Handler has failed. }; // = Set/get the current state. @@ -86,7 +91,7 @@ public: void connection_role (char); char connection_role (void) const; - // = Set/get the <Event_Channel> *. + // = Set/get the <Event_Channel> *. void event_channel (Event_Channel *); Event_Channel *event_channel (void) const; @@ -100,7 +105,7 @@ public: // Perform timer-based Connection_Handler reconnection. virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); + ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); // Perform Connection_Handler termination. protected: @@ -110,7 +115,7 @@ protected: ACE_INET_Addr local_addr_; // Address of us. - CONNECTION_ID connection_id_; + CONNECTION_ID connection_id_; // The assigned connection ID of this entry. size_t total_bytes_; diff --git a/apps/Gateway/Gateway/Connection_Handler_Acceptor.h b/apps/Gateway/Gateway/Connection_Handler_Acceptor.h index fb8d84ad667..777f58c4a5b 100644 --- a/apps/Gateway/Gateway/Connection_Handler_Acceptor.h +++ b/apps/Gateway/Gateway/Connection_Handler_Acceptor.h @@ -5,19 +5,24 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Connection_Handler_acceptor.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (_CONNECTION_HANDLER_ACCEPTOR) +#ifndef _CONNECTION_HANDLER_ACCEPTOR #define _CONNECTION_HANDLER_ACCEPTOR #include "ace/Acceptor.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Acceptor.h" #include "Connection_Handler.h" @@ -31,7 +36,7 @@ class Connection_Handler_Acceptor : public ACE_Acceptor<Connection_Handler, ACE_ // and produces a new Connection_Handler object to do the dirty // work... public: - Connection_Handler_Acceptor (Event_Channel &, + Connection_Handler_Acceptor (Event_Channel &, char connection_role); // Constructor. @@ -42,14 +47,14 @@ public: // Hook method for accepting a connection into the // <Connection_Handler>. -protected: +protected: typedef ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR> inherited; // Make life easier later on. Event_Channel &event_channel_; // Reference to the event channel. - + Connection_Config_Info connection_config_info_; // Keeps track of what type of proxy we need to create. diff --git a/apps/Gateway/Gateway/Connection_Handler_Connector.h b/apps/Gateway/Gateway/Connection_Handler_Connector.h index e81d66d9694..f4e7d7d06a1 100644 --- a/apps/Gateway/Gateway/Connection_Handler_Connector.h +++ b/apps/Gateway/Gateway/Connection_Handler_Connector.h @@ -5,19 +5,24 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Connection_Handler_Connector.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (_IO_HANDLER_CONNECTOR) +#ifndef _IO_HANDLER_CONNECTOR #define _IO_HANDLER_CONNECTOR #include "ace/Connector.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Connector.h" #include "Connection_Handler.h" @@ -31,8 +36,8 @@ public: Connection_Handler_Connector (void); // Initiate (or reinitiate) a connection on the Connection_Handler. - int initiate_connection (Connection_Handler *, - ACE_Synch_Options & = ACE_Synch_Options::synch); + int initiate_connection (Connection_Handler *, + ACE_Synch_Options & = ACE_Synch_Options::synch); }; diff --git a/apps/Gateway/Gateway/Consumer_Dispatch_Set.h b/apps/Gateway/Gateway/Consumer_Dispatch_Set.h index 2f89143460d..3a5d0cf3e25 100644 --- a/apps/Gateway/Gateway/Consumer_Dispatch_Set.h +++ b/apps/Gateway/Gateway/Consumer_Dispatch_Set.h @@ -5,20 +5,24 @@ // // = LIBRARY // apps -// +// // = FILENAME // Consumer_Dispatch_Set.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (CONSUMER_DISPATCH_SET) +#ifndef CONSUMER_DISPATCH_SET #define CONSUMER_DISPATCH_SET #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Forward reference. class Connection_Handler; diff --git a/apps/Gateway/Gateway/Event.h b/apps/Gateway/Gateway/Event.h index 2221f63916a..80413bb5a75 100644 --- a/apps/Gateway/Gateway/Event.h +++ b/apps/Gateway/Gateway/Event.h @@ -5,20 +5,24 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Event.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (EVENT_H) +#ifndef EVENT_H #define EVENT_H #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // = The following #defines should really be in a separate include // file that is shared with the ../Peer/ directory. For now, we'll // keep them here to simplify the sharing between the two directories. @@ -45,7 +49,7 @@ #endif /* DEFAULT_PEER_SUPPLIER_PORT */ #if !defined (MAX_CONSUMERS) -#define MAX_CONSUMERS 1000 +#define MAX_CONSUMERS 1000 #endif /* MAX_CONSUMERS */ // This is the unique supplier identifier that denotes a particular @@ -76,10 +80,10 @@ class Event_Key // <connection_id_> and <type_> fields are copied from the // <Event_Header> class below. public: - Event_Key (CONNECTION_ID cid = -1, + Event_Key (CONNECTION_ID cid = -1, ACE_INT32 type = 0, ACE_INT32 priority = 0) - : connection_id_ (cid), + : connection_id_ (cid), type_ (type), priority_ (priority) { @@ -87,7 +91,7 @@ public: int operator== (const Event_Key &event_addr) const { - return this->connection_id_ == event_addr.connection_id_ + return this->connection_id_ == event_addr.connection_id_ && this->type_ == event_addr.type_; } @@ -187,7 +191,7 @@ public: for (ACE_INT32 i = 0; i < this->total_consumers_; i++) this->consumers_[i] = ntohl (this->consumers_[i]); - + this->total_consumers_ = ntohl (this->total_consumers_); } // Decode from network byte order to host byte order. @@ -198,7 +202,7 @@ public: for (ACE_INT32 i = 0; i < this->total_consumers_; i++) this->consumers_[i] = htonl (this->consumers_[i]); - + this->total_consumers_ = htonl (this->total_consumers_); } // Encode from host byte order to network byte order. @@ -209,7 +213,7 @@ public: ACE_INT32 consumers_[MAX_CONSUMERS]; // Connection ids for consumers that will be routed information // containing this <connection_id_> - + ACE_INT32 total_consumers_; // Total number of these consumers. }; diff --git a/apps/Gateway/Gateway/Event_Channel.h b/apps/Gateway/Gateway/Event_Channel.h index dfe5faa6fd4..4dcb86d24d3 100644 --- a/apps/Gateway/Gateway/Event_Channel.h +++ b/apps/Gateway/Gateway/Event_Channel.h @@ -5,16 +5,16 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Event_Channel.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (ACE_EVENT_CHANNEL) +#ifndef ACE_EVENT_CHANNEL #define ACE_EVENT_CHANNEL #include "Connection_Handler_Connector.h" @@ -64,8 +64,8 @@ public: Connection_Handler *&); // Locate the <Connection_Handler> with <connection_id>. - int subscribe (const Event_Key &event_addr, - Consumer_Dispatch_Set *cds); + int subscribe (const Event_Key &event_addr, + Consumer_Dispatch_Set *cds); // Subscribe the <Consumer_Dispatch_Set> to receive events that // match <Event_Key>. @@ -97,8 +97,8 @@ private: int compute_performance_statistics (void); // Perform timer-based performance profiling. - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg); + virtual int handle_timeout (const ACE_Time_Value &, + const void *arg); // Periodically callback to perform timer-based performance // profiling. @@ -112,11 +112,11 @@ private: // Used to establish connections passively and create Consumers. // = Make life easier by defining typedefs. - typedef ACE_Map_Manager<CONNECTION_ID, Connection_Handler *, MAP_MUTEX> + typedef ACE_Map_Manager<CONNECTION_ID, Connection_Handler *, MAP_MUTEX> CONNECTION_MAP; - typedef ACE_Map_Iterator<CONNECTION_ID, Connection_Handler *, MAP_MUTEX> + typedef ACE_Map_Iterator<CONNECTION_ID, Connection_Handler *, MAP_MUTEX> CONNECTION_MAP_ITERATOR; - typedef ACE_Map_Entry<CONNECTION_ID, Connection_Handler *> + typedef ACE_Map_Entry<CONNECTION_ID, Connection_Handler *> CONNECTION_MAP_ENTRY; CONNECTION_MAP connection_map_; diff --git a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h index 09b62d007d0..10bc4409589 100644 --- a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h +++ b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h @@ -5,19 +5,24 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Event_Forwarding_Discriminator.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (_CONSUMER_MAP_H) +#ifndef _CONSUMER_MAP_H #define _CONSUMER_MAP_H #include "ace/Map_Manager.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" #include "Event.h" #include "Consumer_Dispatch_Set.h" diff --git a/apps/Gateway/Gateway/File_Parser.h b/apps/Gateway/Gateway/File_Parser.h index e32d0948621..a91a8f75827 100644 --- a/apps/Gateway/Gateway/File_Parser.h +++ b/apps/Gateway/Gateway/File_Parser.h @@ -5,31 +5,35 @@ // // = LIBRARY // gateway -// +// // = FILENAME // File_Parser.h // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (_FILE_PARSER) +#ifndef _FILE_PARSER #define _FILE_PARSER #include "ace/OS.h" -class FP +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class FP { // = TITLE // This class serves as a namespace for the <Return_Type>. public: - enum Return_Type - { + enum Return_Type + { EOLINE, EOFILE, - SUCCESS, - COMMENT, + SUCCESS, + COMMENT, DEFAULT, PARSE_ERROR }; @@ -59,7 +63,7 @@ protected: // Read the next integer. FP::Return_Type readword (char buf[]); - // Read the next "word," which is demarcated by <delimiter>s. + // Read the next "word," which is demarcated by <delimiter>s. // // @@ This function is inherently flawed since it doesn't take a // count of the size of <buf>... diff --git a/apps/Gateway/Gateway/Gateway.h b/apps/Gateway/Gateway/Gateway.h index 5c85f6e696c..56f68644c39 100644 --- a/apps/Gateway/Gateway/Gateway.h +++ b/apps/Gateway/Gateway/Gateway.h @@ -5,7 +5,7 @@ // // = LIBRARY // gateway -// +// // = FILENAME // Gateway.h // @@ -14,15 +14,19 @@ // the entry point into the Service Configurator framework. // // = AUTHOR -// Doug Schmidt -// +// Doug Schmidt +// // ============================================================================ -#if !defined (ACE_GATEWAY) +#ifndef ACE_GATEWAY #define ACE_GATEWAY #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + ACE_SVC_FACTORY_DECLARE (Gateway) #endif /* ACE_GATEWAY */ diff --git a/apps/Gateway/Gateway/Options.h b/apps/Gateway/Gateway/Options.h index da61b8202c3..b3da9174a9b 100644 --- a/apps/Gateway/Gateway/Options.h +++ b/apps/Gateway/Gateway/Options.h @@ -14,11 +14,15 @@ // // ============================================================================ -#if !defined (OPTIONS_H) +#ifndef OPTIONS_H #define OPTIONS_H #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class ACE_Svc_Export Options { // = TITLE diff --git a/apps/Gateway/Peer/Options.h b/apps/Gateway/Peer/Options.h index c957e1a295e..dc3daf5ce4b 100644 --- a/apps/Gateway/Peer/Options.h +++ b/apps/Gateway/Peer/Options.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (OPTIONS_H) +#ifndef OPTIONS_H #define OPTIONS_H #include "../Gateway/Event.h" diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h index 2c67bc1f39d..8a48de1c9a7 100644 --- a/apps/Gateway/Peer/Peer.h +++ b/apps/Gateway/Peer/Peer.h @@ -45,10 +45,15 @@ // // ============================================================================ -#if !defined (PEER_H) +#ifndef PEER_H #define PEER_H #include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Acceptor.h" #include "ace/Connector.h" #include "ace/SOCK_Acceptor.h" diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_base.h b/apps/JAWS/PROTOTYPE/HTTPU/http_base.h index 8b939043cee..5f5486f888d 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/http_base.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/http_base.h @@ -1,10 +1,14 @@ // $Id$ -#if !defined (HTTPU_HTTP_BASE_H) +#ifndef HTTPU_HTTP_BASE_H #define HTTPU_HTTP_BASE_H #include "ace/Message_Block.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "JAWS/Parse_Headers.h" #include "HTTPU/http_export.h" #include "HTTPU/http_status.h" diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_export.h b/apps/JAWS/PROTOTYPE/HTTPU/http_export.h index 2a4bc285735..84a819c8932 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/http_export.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/http_export.h @@ -4,11 +4,15 @@ // This file is generated automatically by // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT // ------------------------------ -#if !defined (HTTPU_EXPORT_H) +#ifndef HTTPU_EXPORT_H #define HTTPU_EXPORT_H #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (HTTPU_HAS_DLL) # if (HTTPU_HAS_DLL == 1) # if defined (HTTPU_BUILD_DLL) diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h index 9dea72d399c..62bf936005a 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.h @@ -3,10 +3,15 @@ // by James Hu // Borrowed from HTTP_Headers.*, which appears to be irrelevent now anyway. -#if !defined (HTTPU_HTTP_HEADERS_H) +#ifndef HTTPU_HTTP_HEADERS_H #define HTTPU_HTTP_HEADERS_H #include "ace/RB_Tree.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Singleton.h" #include "JAWS/Parse_Headers.h" diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_request.h b/apps/JAWS/PROTOTYPE/HTTPU/http_request.h index a6934f82b47..c04d08dabf6 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/http_request.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/http_request.h @@ -4,11 +4,15 @@ // One is the kind you have to read in from the HTTP client. // The other is the kind you issue to the server. -#if !defined (HTTPU_HTTP_REQUEST_HPP) +#ifndef HTTPU_HTTP_REQUEST_HPP #define HTTPU_HTTP_REQUEST_HPP #include "ace/Message_Block.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "JAWS/Parse_Headers.h" #include "HTTPU/http_export.h" #include "HTTPU/http_base.h" diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_response.h b/apps/JAWS/PROTOTYPE/HTTPU/http_response.h index d22f736e4e2..71b6cae2fae 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/http_response.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/http_response.h @@ -4,10 +4,15 @@ // One is the kind you have to read in from the HTTP server. // The other is the kind you issue to the HTTP client. -#if !defined (HTTPU_HTTP_RESPONSE_HPP) +#ifndef HTTPU_HTTP_RESPONSE_HPP #define HTTPU_HTTP_RESPONSE_HPP #include "ace/Message_Block.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "JAWS/Parse_Headers.h" #include "HTTPU/http_export.h" diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.h b/apps/JAWS/PROTOTYPE/HTTPU/http_status.h index 47f791675f5..c4d90657b15 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/http_status.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.h @@ -5,6 +5,10 @@ #include "ace/Singleton.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "HTTPU/http_export.h" class HTTP_SCode_Base; diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h index 0f19d9a4919..26c83348e37 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_request.h @@ -1,9 +1,14 @@ // $Id$ -#if !defined (HTTPU_PARSE_HTTP_REQUEST_H) +#ifndef HTTPU_PARSE_HTTP_REQUEST_H #define HTTPU_PARSE_HTTP_REQUEST_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "HTTPU/http_headers.h" class HTTPU_Export Parse_HTTP_Request : public HTTP_HCodes diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h index a4cbc4490ce..42fd5a31afe 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_http_response.h @@ -1,9 +1,14 @@ // $Id$ -#if !defined (HTTPU_PARSE_HTTP_RESPONSE_H) +#ifndef HTTPU_PARSE_HTTP_RESPONSE_H #define HTTPU_PARSE_HTTP_RESPONSE_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "HTTPU/http_export.h" class HTTPU_Export Parse_HTTP_Response diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h b/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h index 66dd4804341..64260edd2a8 100644 --- a/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h +++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_url.h @@ -1,7 +1,7 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (HTTPU_HTTP_PARSE_H) +#ifndef HTTPU_HTTP_PARSE_H #define HTTPU_HTTP_PARSE_H #include "HTTPU/http_export.h" diff --git a/apps/JAWS/PROTOTYPE/HTTP_10.h b/apps/JAWS/PROTOTYPE/HTTP_10.h index 8280eb8a744..5e4055281b1 100644 --- a/apps/JAWS/PROTOTYPE/HTTP_10.h +++ b/apps/JAWS/PROTOTYPE/HTTP_10.h @@ -1,11 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_HTTP_10_H) +#ifndef JAWS_HTTP_10_H #define JAWS_HTTP_10_H #include "ace/RB_Tree.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "JAWS/Pipeline_Tasks.h" // Forward declaration diff --git a/apps/JAWS/PROTOTYPE/HTTP_Policy.h b/apps/JAWS/PROTOTYPE/HTTP_Policy.h index 5963d191d36..873b30f5070 100644 --- a/apps/JAWS/PROTOTYPE/HTTP_Policy.h +++ b/apps/JAWS/PROTOTYPE/HTTP_Policy.h @@ -1,7 +1,7 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (HTTP_POLICY_H) +#ifndef HTTP_POLICY_H #define HTTP_POLICY_H #include "JAWS/Concurrency.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.h b/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.h index 4e44efdb71e..8245cd67028 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.h @@ -1,7 +1,7 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_ASSOC_ARRAY_H) +#ifndef JAWS_ASSOC_ARRAY_H #define JAWS_ASSOC_ARRAY_H template <class KEY, class DATA> class JAWS_Assoc_Array_Iterator; diff --git a/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h b/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h index a1ff3be7c5d..0b7019fe581 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Concurrency.h @@ -1,10 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_CONCURRENCY_H) +#ifndef JAWS_CONCURRENCY_H #define JAWS_CONCURRENCY_H #include "ace/Singleton.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" #include "ace/Task.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h b/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h index 8d05ee8003e..94afaa93586 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Data_Block.h @@ -1,11 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_DATA_BLOCK_H) +#ifndef JAWS_DATA_BLOCK_H #define JAWS_DATA_BLOCK_H #include "ace/Message_Block.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "JAWS/Export.h" #include "JAWS/Pipeline.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Export.h b/apps/JAWS/PROTOTYPE/JAWS/Export.h index b6be46cac93..f06afcdb767 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Export.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Export.h @@ -4,11 +4,15 @@ // This file is generated automatically by // ${TAO_ROOT}/TAO_IDL/GenExportH.BAT // ------------------------------ -#if !defined (JAWS_EXPORT_H) +#ifndef JAWS_EXPORT_H #define JAWS_EXPORT_H #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (JAWS_HAS_DLL) # if (JAWS_HAS_DLL == 1) # if defined (JAWS_BUILD_DLL) diff --git a/apps/JAWS/PROTOTYPE/JAWS/Headers.h b/apps/JAWS/PROTOTYPE/JAWS/Headers.h index 56e8ad3f748..f16db921915 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Headers.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Headers.h @@ -1,12 +1,16 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_HEADERS_H) +#ifndef JAWS_HEADERS_H #define JAWS_HEADERS_H #include "JAWS/Export.h" #include "ace/Containers.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // Use scenario -- // Parse_Headers will parse out a header name and then will want to diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.h b/apps/JAWS/PROTOTYPE/JAWS/IO.h index 967bbe8c542..b2dfac81b98 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/IO.h +++ b/apps/JAWS/PROTOTYPE/JAWS/IO.h @@ -15,7 +15,7 @@ // // ============================================================================ -#if !defined (JAWS_IO_H) +#ifndef JAWS_IO_H #define JAWS_IO_H class ACE_Message_Block; @@ -23,6 +23,11 @@ class JAWS_IO_Handler; class JAWS_IO_Acceptor; #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Asynch_IO.h" #include "ace/SOCK_Stream.h" #include "ace/Singleton.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h index 4cc006d9033..78e861ec12e 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h +++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.h @@ -1,13 +1,18 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_IO_ACCEPTOR_H) +#ifndef JAWS_IO_ACCEPTOR_H #define JAWS_IO_ACCEPTOR_H // Use the Adapter pattern to encapsulate either a LOCK_SOCK_Acceptor or // an ACE_Asynch_Acceptor #include "ace/Asynch_Acceptor.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/LOCK_SOCK_Acceptor.h" #include "ace/Singleton.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h index b474ac6d0bf..7d49dbe3f06 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h +++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.h @@ -15,10 +15,15 @@ // // ============================================================================ -#if !defined (JAWS_IO_HANDLER_H) +#ifndef JAWS_IO_HANDLER_H #define JAWS_IO_HANDLER_H #include "ace/Asynch_IO.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Singleton.h" #include "JAWS/Export.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/JAWS.h b/apps/JAWS/PROTOTYPE/JAWS/JAWS.h index 72dcfc56401..27572fc3b07 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/JAWS.h +++ b/apps/JAWS/PROTOTYPE/JAWS/JAWS.h @@ -8,7 +8,7 @@ ASYS_TEXT (__FILE__)) #endif /* JAWS_NTRACE */ -#if !defined (JAWS_JAWS_H) +#ifndef JAWS_JAWS_H #define JAWS_JAWS_H #endif /* JAWS_JAWS_H */ diff --git a/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.h b/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.h index beddd94a0d2..24bdc0d2462 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.h @@ -1,11 +1,16 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_PARSE_HEADERS_H) +#ifndef JAWS_PARSE_HEADERS_H #define JAWS_PARSE_HEADERS_H #include "JAWS/Export.h" #include "ace/Singleton.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Message_Block.h" #include "Headers.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h index efd21bc556f..ff04b4fb61f 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h @@ -1,10 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_PIPELINE_H) +#ifndef JAWS_PIPELINE_H #define JAWS_PIPELINE_H #include "ace/Synch.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Service_Config.h" #include "ace/Stream.h" #include "ace/Module.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h index 86bbe3930ed..7d95294bf03 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h @@ -1,7 +1,7 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_PIPELINE_HANDLER_H) +#ifndef JAWS_PIPELINE_HANDLER_H #define JAWS_PIPELINE_HANDLER_H #include "JAWS/Export.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h index 0877a40aaf2..4506885b0a2 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h @@ -1,11 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_PIPELINE_TASKS_H) +#ifndef JAWS_PIPELINE_TASKS_H #define JAWS_PIPELINE_TASKS_H #include "ace/Singleton.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "JAWS/Export.h" #include "JAWS/Pipeline.h" #include "JAWS/Data_Block.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Policy.h b/apps/JAWS/PROTOTYPE/JAWS/Policy.h index d916998bb92..9255594c056 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Policy.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Policy.h @@ -1,7 +1,7 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_POLICY_H) +#ifndef JAWS_POLICY_H #define JAWS_POLICY_H #include "JAWS/Export.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Reaper.h b/apps/JAWS/PROTOTYPE/JAWS/Reaper.h index 444083498ce..e23193441c7 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Reaper.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Reaper.h @@ -1,10 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_REAPER_H) +#ifndef JAWS_REAPER_H #define JAWS_REAPER_H #include "ace/Singleton.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" #include "ace/Task.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Server.h b/apps/JAWS/PROTOTYPE/JAWS/Server.h index 8fea040e47d..0cac8f17ae0 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Server.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Server.h @@ -1,7 +1,7 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_SERVER_H) +#ifndef JAWS_SERVER_H #define JAWS_SERVER_H #include "JAWS/Export.h" diff --git a/apps/JAWS/PROTOTYPE/JAWS/Waiter.h b/apps/JAWS/PROTOTYPE/JAWS/Waiter.h index da2535deabf..57bd35086b0 100644 --- a/apps/JAWS/PROTOTYPE/JAWS/Waiter.h +++ b/apps/JAWS/PROTOTYPE/JAWS/Waiter.h @@ -1,11 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_WAITER_H) +#ifndef JAWS_WAITER_H #define JAWS_WAITER_H #include "ace/Singleton.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "JAWS/Assoc_Array.h" #include "JAWS/Export.h" diff --git a/apps/JAWS/clients/Blobby/Blob.h b/apps/JAWS/clients/Blobby/Blob.h index 7f7c79076ec..293e530e696 100644 --- a/apps/JAWS/clients/Blobby/Blob.h +++ b/apps/JAWS/clients/Blobby/Blob.h @@ -5,23 +5,28 @@ // // = LIBRARY // JAWS -// +// // = FILENAME // Blob.h // // = DESCRIPTION // This is the ACE_Blob class, which is the API for doing file -// uploads/downloads. +// uploads/downloads. // // = AUTHOR // Prashant Jain and Sumedh Mungee -// +// //============================================================================ -#if !defined (ACE_BLOB_H) +#ifndef ACE_BLOB_H #define ACE_BLOB_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Connector.h" #include "ace/INET_Addr.h" #include "ace/Svc_Handler.h" @@ -29,12 +34,12 @@ #include "ace/Message_Block.h" #include "Blob_Handler.h" -class ACE_Blob +class ACE_Blob // = TITLE // Blob is intended to provide application API to // classes that wish to do network i/o at a very // high level of abstraction. - // + // // = This class provides the ability to retrieve data from // the network, of specified length and offset, and potentially // use any protocol "under the hood" to do so. It currently @@ -44,38 +49,38 @@ public: ACE_Blob (void); ~ACE_Blob (void); - int open (char *filename, - char *hostname = ACE_DEFAULT_SERVER_HOST , + int open (char *filename, + char *hostname = ACE_DEFAULT_SERVER_HOST , u_short port = 80); // initializes the class with the given filename, hostname and port. - // it should be called with the filename, before any read/write calls + // it should be called with the filename, before any read/write calls int read (ACE_Message_Block *mb, size_t length, size_t offset); // starts a connection, and reads a file from the server, // of length and offset as specified, into Message_Block mb // The message block should have capacity to hold length number - // of bytes + // of bytes int write (ACE_Message_Block *mb, size_t length, size_t offset); // starts a connection, and writes a file to the server, // of length and offset as specified, from Message_Block mb // thus the message block should contain atleast length + offset - // bytes of data - + // bytes of data + int close (); // Frees memory allocated for filename. private: ACE_INET_Addr inet_addr_; - // store the internet address of the server + // store the internet address of the server char *filename_; - // The filename + // The filename ACE_Connector<ACE_Blob_Handler, ACE_SOCK_CONNECTOR> connector_; - // The connector endpoint to initiate the client connection + // The connector endpoint to initiate the client connection }; diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.h b/apps/JAWS/clients/Blobby/Blob_Handler.h index d58202afe5a..a55e0b68ee2 100644 --- a/apps/JAWS/clients/Blobby/Blob_Handler.h +++ b/apps/JAWS/clients/Blobby/Blob_Handler.h @@ -5,24 +5,29 @@ // // = LIBRARY // JAWS -// +// // = FILENAME // Blob.h // // = DESCRIPTION // ACE_Blob_Handler is a base class for ACE_Blob_Reader and // ACE_Blob_Writer which are created in response to calls to -// read/write, as appropriate +// read/write, as appropriate // // = AUTHOR // Prashant Jain and Sumedh Mungee -// +// //============================================================================ -#if !defined (ACE_BLOB_HANDLER_H) +#ifndef ACE_BLOB_HANDLER_H #define ACE_BLOB_HANDLER_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Stream.h" #include "ace/Svc_Handler.h" #include "ace/Message_Block.h" @@ -32,7 +37,7 @@ class ACE_Blob_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH // Blob is intended to provide application API to // classes that wish to do network i/o at a very // high level of abstraction. - // + // // = This class provides the ability to retrieve data from // the network, of specified length and offset, and potentially // use any protocol "under the hood" to do so. It currently @@ -53,7 +58,7 @@ public: virtual int close (u_long flags = 0); // Close down the Blob - + ~ACE_Blob_Handler (void); protected: @@ -65,7 +70,7 @@ protected: size_t offset_; char *filename_; int bytecount_; - enum + enum { MAX_HEADER_SIZE = 2048 // The handler assumes that the first 2048 bytes of a server response @@ -76,10 +81,10 @@ protected: class ACE_Blob_Reader : public ACE_Blob_Handler { public: - ACE_Blob_Reader (ACE_Message_Block *mb, - size_t length, - size_t offset, - char *filename, + ACE_Blob_Reader (ACE_Message_Block *mb, + size_t length, + size_t offset, + char *filename, char *request_prefix = "GET", char *request_suffix = "HTTP/1.0\r\n\r\n"); @@ -93,9 +98,9 @@ private: class ACE_Blob_Writer : public ACE_Blob_Handler { public: - ACE_Blob_Writer (ACE_Message_Block *mb, - size_t length, - size_t offset, + ACE_Blob_Writer (ACE_Message_Block *mb, + size_t length, + size_t offset, char *filename, char *request_prefix = "PUT", char *request_suffix = "HTTP/1.0\nContent-length:"); diff --git a/apps/JAWS/clients/Blobby/Options.h b/apps/JAWS/clients/Blobby/Options.h index 086fa003a37..5fe61c55cfa 100644 --- a/apps/JAWS/clients/Blobby/Options.h +++ b/apps/JAWS/clients/Blobby/Options.h @@ -5,7 +5,7 @@ // // = LIBRARY // JAWS -// +// // = FILENAME // Options.h // @@ -14,18 +14,23 @@ // // = AUTHOR // Prashant Jain and Sumedh Mungee -// +// //============================================================================ -#if !defined (ACE_BLOBBY_OPTIONS_H) +#ifndef ACE_BLOBBY_OPTIONS_H #define ACE_BLOBBY_OPTIONS_H #include "Blob.h" #include "Blob_Handler.h" #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/ARGV.h" -class Options +class Options { public: static Options *instance (void); @@ -38,7 +43,7 @@ public: // Hostname to connect to u_short port_; - // Port number to use + // Port number to use char *filename_; // Filename to upload/download diff --git a/apps/JAWS/clients/Caching/ID_Generator.h b/apps/JAWS/clients/Caching/ID_Generator.h index 0d73f72625c..3c02779f36e 100644 --- a/apps/JAWS/clients/Caching/ID_Generator.h +++ b/apps/JAWS/clients/Caching/ID_Generator.h @@ -15,16 +15,20 @@ // // ============================================================================ -#if !defined (ACE_ID_GENERATOR_H) +#ifndef ACE_ID_GENERATOR_H #define ACE_ID_GENERATOR_h #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #define ACE_OFFER_ID_LENGTH 21 class ACE_ID_Generator // = TITLE - // An unique ID generator. + // An unique ID generator. // // = DESCRIPTION @@ -43,12 +47,12 @@ private: static ACE_SYNCH_MUTEX *get_lock (void); // Get the lock instance. - + static time_t last_time_; // Record the time last offer ID generated. static size_t last_number_; - // Record serial number of last offer ID with same + // Record serial number of last offer ID with same // generation time. static ACE_SYNCH_MUTEX *lock_; diff --git a/apps/JAWS/clients/Caching/Local_Locator.h b/apps/JAWS/clients/Caching/Local_Locator.h index aa6c73decf6..a88463b11fc 100644 --- a/apps/JAWS/clients/Caching/Local_Locator.h +++ b/apps/JAWS/clients/Caching/Local_Locator.h @@ -15,11 +15,16 @@ // // ============================================================================ -#if !defined (ACE_LOCAL_LOCATOR_H) +#ifndef ACE_LOCAL_LOCATOR_H #define ACE_LOCAL_LOCATOR_H #include "URL_Locator.h" #include "ace/Containers.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ID_Generator.h" class ACE_SVC_Export ACE_URL_Record @@ -76,30 +81,30 @@ class ACE_SVC_Export ACE_URL_Local_Locator // Default destructor. virtual int url_query (const ACE_URL_Locator::ACE_Selection_Criteria how, - const ACE_URL_Property_Seq *pseq, - const size_t how_many, - size_t &num_query, - ACE_URL_Offer_Seq *offer); + const ACE_URL_Property_Seq *pseq, + const size_t how_many, + size_t &num_query, + ACE_URL_Offer_Seq *offer); // Query the locator for HTTP with designate properties (none, some, // or all). The locator being queried will return a sequence of // offers with <how_many> offers in it. This interface allocates // <offer> so users must deallocate it after use. virtual int export_offer (ACE_URL_Offer *offer, - ACE_WString &offer_id); + ACE_WString &offer_id); // Export an offer to the locator. virtual int withdraw_offer (const ACE_WString &offer_id); // Withdraw an offer. return 0 if succeed, -1 otherwise. virtual int describe_offer (const ACE_WString &offer_id, - ACE_URL_Offer *offer); + ACE_URL_Offer *offer); // Query a specific offer. virtual int modify_offer (const ACE_WString &offer_id, - const ACE_WString *url = 0, - const ACE_URL_Property_Seq *del = 0, - const ACE_URL_Property_Seq *modify = 0); + const ACE_WString *url = 0, + const ACE_URL_Property_Seq *del = 0, + const ACE_URL_Property_Seq *modify = 0); // Modify a previously registered offer. protected: diff --git a/apps/JAWS/clients/Caching/Locator_Request_Reply.h b/apps/JAWS/clients/Caching/Locator_Request_Reply.h index 579ad82a5cd..85dd7a182a6 100644 --- a/apps/JAWS/clients/Caching/Locator_Request_Reply.h +++ b/apps/JAWS/clients/Caching/Locator_Request_Reply.h @@ -15,7 +15,7 @@ // // ============================================================================ -#if !defined (ACE_LOCATOR_REQUEST_REPLY_H) +#ifndef ACE_LOCATOR_REQUEST_REPLY_H #define ACE_LOCATOR_REQUEST_REPLY_H #include "URL_Properties.h" @@ -26,8 +26,8 @@ class ACE_SVC_Export ACE_URL_Locator_Request // // = DESCRIPTION // This class defines a URL request data. It is used - // to transform requests to an object so that we can - // ship them across network. + // to transform requests to an object so that we can + // ship them across network. { public: ACE_URL_Locator_Request (void); @@ -37,8 +37,8 @@ public: // Default dtor. int url_query (const int how, - const ACE_URL_Property_Seq &pseq, - const int how_many); + const ACE_URL_Property_Seq &pseq, + const int how_many); // Query the locator for HTTP with designate properties (none, some, // or all). The locator being queried will return a sequence of // offers with <how_many> offers in it. This interface allocates @@ -54,15 +54,15 @@ public: // Query a specific offer. int modify_offer (const ACE_WString &offer_id, - const char *url = 0, - const ACE_URL_Property_Seq &del = 0, - const ACE_URL_Property_Seq &modify = 0); + const char *url = 0, + const ACE_URL_Property_Seq &del = 0, + const ACE_URL_Property_Seq &modify = 0); // Modify a previously registered offer. int modify_offer (const ACE_WString &offer_id, - const ACE_WString *url = 0, - const ACE_URL_Property_Seq &del = 0, - const ACE_URL_Property_Seq &modify = 0); + const ACE_WString *url = 0, + const ACE_URL_Property_Seq &del = 0, + const ACE_URL_Property_Seq &modify = 0); // Modify a previously registered offer. size_t encode (void); @@ -101,7 +101,7 @@ protected: VALID_OFFER = 0X4 }; // These constants used to indicate which pointers are valid. - + u_int code_; // Request type code. @@ -128,9 +128,9 @@ protected: ACE_WString url_; // URL of this offer. - + char *buffer_; - // Buffer to store encoded data. + // Buffer to store encoded data. }; class ACE_SVC_Export ACE_URL_Locator_Reply @@ -139,8 +139,8 @@ class ACE_SVC_Export ACE_URL_Locator_Reply // // = DESCRIPTION // This class defines a URL reply data. It is used - // to transform reply messages to an object so that we can - // ship them across network. + // to transform reply messages to an object so that we can + // ship them across network. { public: ACE_URL_Locator_Reply (void); @@ -153,11 +153,11 @@ public: // Setup a reply message for EXPORT, WITHDRAW, or MODIFY operations. int query_reply (int result, size_t num, - const ACE_URL_Offer_Seq &offers); + const ACE_URL_Offer_Seq &offers); // Setup a reply for QUERY operation. int describe_reply (int result, - const ACE_URL_Offer &offer); + const ACE_URL_Offer &offer); // Construct a reply for DESCRIBE operation. size_t encode (void); @@ -191,7 +191,7 @@ protected: VALID_OFFERS = 0x2 }; // Valid pointer masks. - + u_int code_; // Holds the original op code. diff --git a/apps/JAWS/clients/Caching/URL_Array_Helper.h b/apps/JAWS/clients/Caching/URL_Array_Helper.h index 08a261138fc..f38f9ebf5dd 100644 --- a/apps/JAWS/clients/Caching/URL_Array_Helper.h +++ b/apps/JAWS/clients/Caching/URL_Array_Helper.h @@ -5,16 +5,16 @@ // // = LIBRARY // none -// +// // = FILENAME // URL_Array_Helper.h // // = AUTHOR // Nanbor Wang -// +// // ============================================================================ -#if !defined (ACE_URL_ARRAY_HELPER_H) +#ifndef ACE_URL_ARRAY_HELPER_H #define ACE_URL_ARRAY_HELPER_H // ### These template functions are probably named improperly. diff --git a/apps/JAWS/clients/Caching/URL_Locator.h b/apps/JAWS/clients/Caching/URL_Locator.h index 2b41cd5ed50..75ef5623b4e 100644 --- a/apps/JAWS/clients/Caching/URL_Locator.h +++ b/apps/JAWS/clients/Caching/URL_Locator.h @@ -15,7 +15,7 @@ // // ============================================================================ -#if !defined (ACE_URL_LOCATOR_H) +#ifndef ACE_URL_LOCATOR_H #define ACE_URL_LOCATOR_H #include "URL_Properties.h" @@ -29,7 +29,7 @@ class ACE_SVC_Export ACE_URL_Locator // This class defines the basic URL_Locator APIs. // An URL locator provides services for URL clients to // query specific URL location that has certain properties - // and URL providers to export their services and a set of + // and URL providers to export their services and a set of // APIs to maintain their offers. { public: @@ -41,19 +41,19 @@ public: WITHDRAW, DESCRIBE, MODIFY, - INVALID_OPERATION // LAST + INVALID_OPERATION // LAST }; static const char * const opname[]; // Human Readable operation name. - + // = Specify how to select offers. enum ACE_Selection_Criteria - { - NONE = 0, // URL that contains none of the properties. - SOME, // URL that contains some of the properties. - ALL, // URL that contains all of the properties. - INVALID_SELECTION // Invalid. + { + NONE = 0, // URL that contains none of the properties. + SOME, // URL that contains some of the properties. + ALL, // URL that contains all of the properties. + INVALID_SELECTION // Invalid. }; static const char * const selection_name[]; @@ -61,13 +61,13 @@ public: enum ACE_URL_Locator_Error // errno will set to one of these value. { - OK, // Everything is fine. - OFFER_EXIST, // trying to register an offer. - // that is already exist in repository. - NO_SUCH_OFFER, // No such offer in the repository. - INVALID_ARGUMENT, // Invalid argument encountered. - UNIMPLEMENTED, // function not implemented. - UNKNOWN, // Unknown error. + OK, // Everything is fine. + OFFER_EXIST, // trying to register an offer. + // that is already exist in repository. + NO_SUCH_OFFER, // No such offer in the repository. + INVALID_ARGUMENT, // Invalid argument encountered. + UNIMPLEMENTED, // function not implemented. + UNKNOWN, // Unknown error. MAX_URL_ERROR }; // Possible error code of URL_Locator. @@ -79,30 +79,30 @@ public: // Default destructor. virtual int url_query (const ACE_Selection_Criteria how, - const ACE_URL_Property_Seq *pseq, - const size_t how_many, - size_t &num_query, - ACE_URL_Offer_Seq *offer) = 0; + const ACE_URL_Property_Seq *pseq, + const size_t how_many, + size_t &num_query, + ACE_URL_Offer_Seq *offer) = 0; // Query the locator for HTTP with designate properties (none, some, // or all). The locator being queried will return a sequence of // offers with <how_many> offers in it. This interface allocates // <offer> so users must deallocate it after use. virtual int export_offer (ACE_URL_Offer *offer, - ACE_WString &offer_id) = 0; + ACE_WString &offer_id) = 0; // Export an offer to the locator. virtual int withdraw_offer (const ACE_WString &offer_id) = 0; // Withdraw an offer. return 0 if succeed, -1 otherwise. virtual int describe_offer (const ACE_WString &offer_id, - ACE_URL_Offer *offer) = 0; + ACE_URL_Offer *offer) = 0; // Query a specific offer. virtual int modify_offer (const ACE_WString &offer_id, - const ACE_WString *url = 0, - const ACE_URL_Property_Seq *del = 0, - const ACE_URL_Property_Seq *modify = 0) = 0; + const ACE_WString *url = 0, + const ACE_URL_Property_Seq *del = 0, + const ACE_URL_Property_Seq *modify = 0) = 0; // Modify a previously registered offer. virtual const char *error_status (void); diff --git a/apps/JAWS/clients/Caching/URL_Properties.h b/apps/JAWS/clients/Caching/URL_Properties.h index 18ae4bc6b2f..86cd5ff76b7 100644 --- a/apps/JAWS/clients/Caching/URL_Properties.h +++ b/apps/JAWS/clients/Caching/URL_Properties.h @@ -15,10 +15,15 @@ // // ============================================================================ -#if !defined (ACE_URL_PROPERTIES_H) +#ifndef ACE_URL_PROPERTIES_H #define ACE_URL_PROPERTIES_H #include "ace/SString.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Containers.h" class ACE_SVC_Export ACE_WString_Helper @@ -56,17 +61,17 @@ class ACE_SVC_Export ACE_URL_Property { public: ACE_URL_Property (const char *name = 0, - const char *value=0); + const char *value=0); // Create a new property. ACE_URL_Property (const ACE_USHORT16 *name, - const ACE_USHORT16 *value); + const ACE_USHORT16 *value); // Create a new property using wchar strings. This is mostly used // to support DBCS or UNICODE. ACE_URL_Property (const ACE_URL_Property &p); // Copy constructor. - + ~ACE_URL_Property (void); // Destructor. @@ -91,7 +96,7 @@ public: ACE_WString &value_rep (void); const ACE_WString &value (void) const; - // = Set property value. + // = Set property value. void value (const ACE_USHORT16 *v); void value (const char *v); @@ -104,15 +109,15 @@ public: size_t decode (void *buf); // Decodes buf and modifies this object, you should - // probably create this with default ctor. + // probably create this with default ctor. void dump (void) const; // Dump out this object for debug. - + protected: ACE_WString name_; // Property name pointer. - + ACE_WString value_; // Property value. } ; @@ -159,7 +164,7 @@ public: ACE_URL_Property_Seq &url_properties (void); // Get properties of this offer. - + void url_properties (const ACE_URL_Property_Seq &prop); // Set properties of this offer. This operation virtually get a // copy of the passed in prop. diff --git a/apps/JAWS/clients/Caching/http_handler.h b/apps/JAWS/clients/Caching/http_handler.h index 85a1b9338fe..ec736312c0e 100644 --- a/apps/JAWS/clients/Caching/http_handler.h +++ b/apps/JAWS/clients/Caching/http_handler.h @@ -6,22 +6,27 @@ // // = LIBRARY // apps/JAWS/clients/Caching -// +// // = FILENAME // http_handler.h // // = AUTHOR // James Hu -// +// // ============================================================================ #include "ace/Connector.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/SOCK_Connector.h" class HTTP_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> // = TITLE // A simple HTTP protocol handler for clients. - // + // // = DESCRIPTION // Checks to see if the requested file is already cached. If // so, it says so. If not, the request is issued to the @@ -52,7 +57,7 @@ private: class HTTP_Connector // = TITLE // A simple HTTP connector. - // + // // = DESCRIPTION // Creates an HTTP Handler based on the URL, and then delegates // to to the SOCK_CONNECTOR. Adapter pattern. @@ -63,9 +68,9 @@ public: private: int parseurl (const char *url, - char *host, - u_short *port, - char *path); + char *host, + u_short *port, + char *path); // Helper function. private: diff --git a/apps/JAWS/clients/WebSTONE/src/acconfig.h b/apps/JAWS/clients/WebSTONE/src/acconfig.h index ea85c00c0ba..7878554b6b8 100644 --- a/apps/JAWS/clients/WebSTONE/src/acconfig.h +++ b/apps/JAWS/clients/WebSTONE/src/acconfig.h @@ -1,5 +1,5 @@ -/* Special definitions for autoheader - Copyright (C) 1995 Silicon Graphics, Inc. +/* Special definitions for autoheader + Copyright (C) 1995 Silicon Graphics, Inc. $Header$ */ diff --git a/apps/JAWS/clients/WebSTONE/src/bench.h b/apps/JAWS/clients/WebSTONE/src/bench.h index 069bf3c1694..cc196ef09ac 100644 --- a/apps/JAWS/clients/WebSTONE/src/bench.h +++ b/apps/JAWS/clients/WebSTONE/src/bench.h @@ -1,14 +1,14 @@ /************************************************************************** - * * - * Copyright (C) 1995 Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs were * + * * + * Copyright (C) 1995 Silicon Graphics, Inc. * + * * + * These coded instructions, statements, and computer programs were * * developed by SGI for public use. If any changes are made to this code* * please try to get the changes back to the author. Feel free to make * - * modifications and changes to the code and release it. * - * * + * modifications and changes to the code and release it. * + * * **************************************************************************/ -#ifndef __BENCH_H__ +#ifndef __BENCH_H__ #define __BENCH_H__ #include <stdio.h> #include <stdarg.h> @@ -16,82 +16,82 @@ #include <sys/time.h> #endif /* WIN32 */ -#define USECINSEC 1000000 -#define MSECINSEC 1000 -#define MAX_ACCEPT_SECS 180 /* maximum time master will wait for listen() */ +#define USECINSEC 1000000 +#define MSECINSEC 1000 +#define MAX_ACCEPT_SECS 180 /* maximum time master will wait for listen() */ -#define NCCARGS 4096 -#define MAXCLIENTS 1024 -#define MAXUSERNAME 25 -#define MAXPASSWD 20 -#define BUFSIZE 4096 +#define NCCARGS 4096 +#define MAXCLIENTS 1024 +#define MAXUSERNAME 25 +#define MAXPASSWD 20 +#define BUFSIZE 4096 -#define MAXTOTALPROCS MAXCLIENTS /* overall max # of procs */ -#define MAXPROCSPERNODE MAXCLIENTS /* max # of procs/node */ +#define MAXTOTALPROCS MAXCLIENTS /* overall max # of procs */ +#define MAXPROCSPERNODE MAXCLIENTS /* max # of procs/node */ -#define CONTENT_LENGTH_STRING "CONTENT-LENGTH:" -#define OKSTR "OK" -#define OKSTRLEN ((int)strlen(OKSTR)) -#define GOSTR "GO" -#define GOSTRLEN ((int)strlen(GOSTR)) -#define READYSTR "READY" -#define READYSTRLEN ((int)strlen(READYSTR)) -#define ABORTSTR "ABORT" -#define ABORTSTRLEN ((int)strlen(ABORTSTR)) +#define CONTENT_LENGTH_STRING "CONTENT-LENGTH:" +#define OKSTR "OK" +#define OKSTRLEN ((int)strlen(OKSTR)) +#define GOSTR "GO" +#define GOSTRLEN ((int)strlen(GOSTR)) +#define READYSTR "READY" +#define READYSTRLEN ((int)strlen(READYSTR)) +#define ABORTSTR "ABORT" +#define ABORTSTRLEN ((int)strlen(ABORTSTR)) -#define MAXNUMOFFILES 1 /* max # of files per page */ -#define URL_SIZE 1024 -#define MAXNUMOFPAGES 100 +#define MAXNUMOFFILES 1 /* max # of files per page */ +#define URL_SIZE 1024 +#define MAXNUMOFPAGES 100 #define SIZEOF_TIMEVALTEXT 18 #define SIZEOF_DOUBLETEXT 18 #define SIZEOF_RQSTSTATSTEXT ((7 * SIZEOF_TIMEVALTEXT) + \ - (12 * SIZEOF_DOUBLETEXT) + 1) + (12 * SIZEOF_DOUBLETEXT) + 1) #define SIZEOF_STATSTEXTBASE (SIZEOF_RQSTSTATSTEXT + \ - (3 * SIZEOF_TIMEVALTEXT) + \ - (2 * SIZEOF_DOUBLETEXT) + 1) + (3 * SIZEOF_TIMEVALTEXT) + \ + (2 * SIZEOF_DOUBLETEXT) + 1) #define SIZEOF_STATSTEXT (SIZEOF_STATSTEXTBASE + MAXNUMOFPAGES * SIZEOF_DOUBLETEXT) #define SIZEOF_PAGESTATSTEXT (SIZEOF_RQSTSTATSTEXT + \ - (0 * SIZEOF_TIMEVALTEXT) + \ - (3 * SIZEOF_DOUBLETEXT) + 1) + (0 * SIZEOF_TIMEVALTEXT) + \ + (3 * SIZEOF_DOUBLETEXT) + 1) #define D_PRINTF debug && d_printf #ifdef USE_TIMEZONE typedef struct rqst_timer { - struct timeval entertime; - struct timezone entertimezone; - struct timeval beforeconnect; - struct timezone beforeconnectzone; - struct timeval afterconnect; - struct timezone afterconnectzone; - struct timeval beforeheader; - struct timezone beforeheaderzone; - struct timeval afterheader; - struct timezone afterheaderzone; - struct timeval afterbody; - struct timezone afterbodyzone; - struct timeval exittime; - struct timezone exittimezone; - long unsigned int totalbytes; - long unsigned int bodybytes; - int valid; - long unsigned int page_number; + struct timeval entertime; + struct timezone entertimezone; + struct timeval beforeconnect; + struct timezone beforeconnectzone; + struct timeval afterconnect; + struct timezone afterconnectzone; + struct timeval beforeheader; + struct timezone beforeheaderzone; + struct timeval afterheader; + struct timezone afterheaderzone; + struct timeval afterbody; + struct timezone afterbodyzone; + struct timeval exittime; + struct timezone exittimezone; + long unsigned int totalbytes; + long unsigned int bodybytes; + int valid; + long unsigned int page_number; } rqst_timer_t; #else typedef struct rqst_timer { - struct timeval entertime; - struct timeval beforeconnect; - struct timeval afterconnect; - struct timeval beforeheader; - struct timeval afterheader; - struct timeval afterbody; - struct timeval exittime; - long unsigned int totalbytes; - long unsigned int bodybytes; - int valid; - long unsigned int page_number; + struct timeval entertime; + struct timeval beforeconnect; + struct timeval afterconnect; + struct timeval beforeheader; + struct timeval afterheader; + struct timeval afterbody; + struct timeval exittime; + long unsigned int totalbytes; + long unsigned int bodybytes; + int valid; + long unsigned int page_number; } rqst_timer_t; #endif /* USE_TIMEZONE */ @@ -101,52 +101,52 @@ extern void rqtimer_init(rqst_timer_t *); typedef struct rqst_stats { struct timeval totalresponsetime; struct timezone totalresponsetimezone; - double totalresponsetimesq; + double totalresponsetimesq; struct timeval minresponsetime; struct timezone minresponsetimezone; struct timeval maxresponsetime; struct timezone maxresponsetimezone; struct timeval totalconnecttime; struct timezone totalconnecttimezone; - double totalconnecttimesq; + double totalconnecttimesq; struct timeval minconnecttime; struct timezone minconnecttimezone; struct timeval maxconnecttime; struct timezone maxconnecttimezone; - long unsigned int totalconnects; - long unsigned int totalerrs; - struct timeval totalerrortime; - struct timezone totalerrortimezone; - double totalbytes; - double totalbytessq; - double minbytes; - double maxbytes; - double totalbody; - double totalbodysq; - double minbody; - double maxbody; + long unsigned int totalconnects; + long unsigned int totalerrs; + struct timeval totalerrortime; + struct timezone totalerrortimezone; + double totalbytes; + double totalbytessq; + double minbytes; + double maxbytes; + double totalbody; + double totalbodysq; + double minbody; + double maxbody; } rqst_stats_t; #else typedef struct rqst_stats { struct timeval totalresponsetime; - double totalresponsetimesq; + double totalresponsetimesq; struct timeval minresponsetime; struct timeval maxresponsetime; struct timeval totalconnecttime; - double totalconnecttimesq; + double totalconnecttimesq; struct timeval minconnecttime; struct timeval maxconnecttime; - long unsigned int totalconnects; - long unsigned int totalerrs; - struct timeval totalerrortime; - double totalbytes; - double totalbytessq; - double minbytes; - double maxbytes; - double totalbody; - double totalbodysq; - double minbody; - double maxbody; + long unsigned int totalconnects; + long unsigned int totalerrs; + struct timeval totalerrortime; + double totalbytes; + double totalbytessq; + double minbytes; + double maxbytes; + double totalbody; + double totalbodysq; + double minbody; + double maxbody; } rqst_stats_t; #endif /* USE_TIMEZONE */ @@ -158,28 +158,28 @@ extern void rqstat_times(rqst_stats_t *, rqst_timer_t *); #ifdef USE_TIMEZONE typedef struct stats { - /* char hostname[MAXHOSTNAMELEN]; */ - rqst_stats_t rs; + /* char hostname[MAXHOSTNAMELEN]; */ + rqst_stats_t rs; struct timeval starttime; struct timezone starttimezone; struct timeval endtime; struct timezone endtimezone; - struct timeval datatime; - struct timezone datatimezone; - long unsigned int totalpages; - unsigned int total_num_of_files; - unsigned int page_numbers[MAXNUMOFPAGES]; + struct timeval datatime; + struct timezone datatimezone; + long unsigned int totalpages; + unsigned int total_num_of_files; + unsigned int page_numbers[MAXNUMOFPAGES]; } stats_t; #else typedef struct stats { - /* char hostname[MAXHOSTNAMELEN]; */ - rqst_stats_t rs; + /* char hostname[MAXHOSTNAMELEN]; */ + rqst_stats_t rs; struct timeval starttime; struct timeval endtime; - struct timeval datatime; - long unsigned int totalpages; - unsigned int total_num_of_files; - unsigned int page_numbers[MAXNUMOFPAGES]; + struct timeval datatime; + long unsigned int totalpages; + unsigned int total_num_of_files; + unsigned int page_numbers[MAXNUMOFPAGES]; } stats_t; #endif /* USE_TIMEZONE */ @@ -188,10 +188,10 @@ extern stats_t * text_to_stats(char *); extern char * stats_to_text(const stats_t *); typedef struct page_stats { - rqst_stats_t rs; - long unsigned int totalpages; - unsigned int page_size; - int page_valid; + rqst_stats_t rs; + long unsigned int totalpages; + unsigned int page_size; + int page_valid; } page_stats_t; extern void page_stats_init(page_stats_t *); @@ -200,11 +200,11 @@ extern char * page_stats_to_text(const page_stats_t *); /* THIS STRUCTURE DEFINES A PAGE. */ typedef struct page_list { - int load_num; - int num_of_files; - char *(filename[MAXNUMOFFILES]); - char *(servername[MAXNUMOFFILES]); - int port_number[MAXNUMOFFILES]; + int load_num; + int num_of_files; + char *(filename[MAXNUMOFFILES]); + char *(servername[MAXNUMOFFILES]); + int port_number[MAXNUMOFFILES]; }page_list_t; @@ -213,8 +213,8 @@ typedef struct page_list { extern THREAD FILE *debugfile; extern int debug; -extern int savefile; -extern int timeexpired; +extern int savefile; +extern int timeexpired; extern long int number_of_pages; /* routines in bench.c */ @@ -239,32 +239,32 @@ extern int get(char *loc, NETPORT port, char *url, rqst_timer_t *timer); /* routines in parse_file_list.c */ extern int count_file_list(const char *url_list_file); -extern void parse_file_list (const char *url_list_file, page_list_t *page_list, - long int *num_of_pages, long int *num_of_files); +extern void parse_file_list (const char *url_list_file, page_list_t *page_list, + long int *num_of_pages, long int *num_of_files); extern long int load_percent(page_list_t *page_list, long int number_of_pages); /* routines in statistics.c (formerly statistics.h) */ -extern double mean(const double, const int); -extern double variance(const double, const double, const int); -extern double stddev(const double, const double, const int); +extern double mean(const double, const int); +extern double variance(const double, const double, const int); +extern double stddev(const double, const double, const int); /* routines in timefunc.c (formerly timefunc.h) */ -extern double timevaldouble(struct timeval *); -extern void doubletimeval(const double, struct timeval *); +extern double timevaldouble(struct timeval *); +extern void doubletimeval(const double, struct timeval *); -extern void addtime(struct timeval *, struct timeval *); -extern void compdifftime(struct timeval *, struct timeval *, struct timeval *); -extern void mintime(struct timeval *, struct timeval *); -extern void maxtime(struct timeval *, struct timeval *); -extern void avgtime(struct timeval *, int, struct timeval *); -extern void variancetime(struct timeval *, double, int, struct timeval *); -extern void stddevtime(struct timeval *, double, int, struct timeval *); +extern void addtime(struct timeval *, struct timeval *); +extern void compdifftime(struct timeval *, struct timeval *, struct timeval *); +extern void mintime(struct timeval *, struct timeval *); +extern void maxtime(struct timeval *, struct timeval *); +extern void avgtime(struct timeval *, int, struct timeval *); +extern void variancetime(struct timeval *, double, int, struct timeval *); +extern void stddevtime(struct timeval *, double, int, struct timeval *); -extern void sqtime(struct timeval *, struct timeval *); +extern void sqtime(struct timeval *, struct timeval *); -extern double thruputpersec(const double, struct timeval *); +extern double thruputpersec(const double, struct timeval *); /* routines in webclient.c */ diff --git a/apps/JAWS/clients/WebSTONE/src/get.h b/apps/JAWS/clients/WebSTONE/src/get.h index 3f9fb7a1e76..0b254d1519a 100644 --- a/apps/JAWS/clients/WebSTONE/src/get.h +++ b/apps/JAWS/clients/WebSTONE/src/get.h @@ -2,15 +2,15 @@ #define __GET_H__ /************************************************************************** $Header$ - * Copyright (C) 1995 Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs where * + * Copyright (C) 1995 Silicon Graphics, Inc. * + * * + * These coded instructions, statements, and computer programs where * * deveolped by SGI for public use. If anychanges are made to this code * * please try to get the changes back to the author. Feel free to make * - * modfications and changes to the code and release it. * - * * + * modfications and changes to the code and release it. * + * * **************************************************************************/ - -extern int get(char *loc, int port, char *url, rqst_timer_t *timer); + +extern int get(char *loc, int port, char *url, rqst_timer_t *timer); #endif /* !__GET_H__ */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h index 0ceb060d766..8f368ed1525 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/buffer.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,24 +13,24 @@ /* * buffer.h: For performing buffered I/O on a file or socket descriptor. - * + * * This is an abstraction to allow I/O to be performed regardless of the - * current system. That way, an integer file descriptor can be used under + * current system. That way, an integer file descriptor can be used under * UNIX but a stdio FILE structure could be used on systems which don't * support that or don't support it as efficiently. - * + * * Two abstractions are defined: A file buffer, and a network buffer. A * distinction is made so that mmap() can be used on files (but is not - * required). Also, the file buffer takes a file name as the object to + * required). Also, the file buffer takes a file name as the object to * open instead of a file descriptor. A lot of the network buffering * is almost an exact duplicate of the non-mmap file buffering. - * + * * If an error occurs, system-independent means to obtain an error string * are also provided. However, if the underlying system is UNIX the error * may not be accurate in a threaded environment. - * + * * Rob McCool - * + * */ @@ -50,7 +50,7 @@ #include "net.h" /* - * Requires that the macro MALLOC be set to a "safe" malloc that will + * Requires that the macro MALLOC be set to a "safe" malloc that will * exit if no memory is available. If not under MCC httpd, define MALLOC * to be the real malloc and play with fire, or make your own function. */ @@ -102,9 +102,9 @@ typedef struct { /* - * netbuf_getc gets a character from the given network buffer and returns + * netbuf_getc gets a character from the given network buffer and returns * it. (as an integer). - * + * * It will return (int) IO_ERROR for an error and (int) IO_EOF for * an error condition or EOF respectively. */ @@ -128,7 +128,7 @@ typedef struct { #define buffer_error(b) ((b)->errmsg) /* - * buffer_flush flushes any data after the current pos to the file + * buffer_flush flushes any data after the current pos to the file * descriptor fd. Regardless of buffer type. */ @@ -144,7 +144,7 @@ typedef struct { * buffer of size sz, and returns a new buffer structure which will hold * the data. * - * If FILE_UNIX_MMAP is defined, this may return NULL. If it does, check + * If FILE_UNIX_MMAP is defined, this may return NULL. If it does, check * system_errmsg to get a message about the error. */ @@ -181,12 +181,12 @@ void filebuf_close(filebuf *buf); void netbuf_close(netbuf *buf); /* - * buffer_grab will set the buffer's inbuf array to an array of sz bytes - * from the buffer's associated object. It returns the number of bytes + * buffer_grab will set the buffer's inbuf array to an array of sz bytes + * from the buffer's associated object. It returns the number of bytes * actually read (between 1 and sz). It returns IO_EOF upon EOF or IO_ERROR * upon error. The cursize entry of the structure will reflect the size * of the iobuf array. - * + * * The buffer will take care of allocation and deallocation of this array. */ @@ -204,7 +204,7 @@ int netbuf_grab(netbuf *buf, int sz); int netbuf_buf2sd(netbuf *buf, SYS_NETFD sd, int len); /* - * filebuf_buf2sd assumes that nothing has been read from the filebuf, + * filebuf_buf2sd assumes that nothing has been read from the filebuf, * and just sends the file out to the given socket. Returns IO_ERROR on error * and the number of bytes sent otherwise. * diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h index 543147104a2..6cfdbd6c2c6 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,9 +13,9 @@ /* * cinfo.h: Content Information for a file, i.e. its type, etc. - * - * See cinfo.c for dependency information. - * + * + * See cinfo.c for dependency information. + * * Rob McCool */ @@ -62,9 +62,9 @@ /* * The ContentInfo structure. - * + * * Currently, we support the following attributes: - * + * * 1. Type: This identifies what kind of data is in the file. * 2. Encoding: Identifies any compression or otherwise content-independent * transformation which has been applied to the file (uuencode, etc.) @@ -72,7 +72,7 @@ * 4. Description: A text string describing the file. * 5. Viewer: The program to use to view the file. * - * Multiple items are separated with a comma, e.g. + * Multiple items are separated with a comma, e.g. * encoding="x-gzip, x-uuencode" */ @@ -87,7 +87,7 @@ typedef struct { /* - * cinfo_init initializes the content info system. Call this before + * cinfo_init initializes the content info system. Call this before * cinfo_merge. */ @@ -100,7 +100,7 @@ void cinfo_init(void); void cinfo_terminate(void); /* - * cinfo_merge merges the contents of the given filename with the current + * cinfo_merge merges the contents of the given filename with the current * cinfo database. It returns NULL upon success and a string (which you * must deallocate) upon error. */ @@ -114,7 +114,7 @@ char *cinfo_merge(char *fn); * separated by CINFO_SEPARATOR. You may pass in a filename instead of uri. * * Returns a newly allocated cinfo structure with the information it - * finds. The elements of this structure are coming right out of the types + * finds. The elements of this structure are coming right out of the types * database and so if you change it or want to keep it around for long you * should strdup it. You should free only the structure itself when finished * with it. @@ -127,7 +127,7 @@ char *cinfo_merge(char *fn); cinfo *cinfo_find(char *uri); /* - * cinfo_lookup finds the information about the given content-type, and + * cinfo_lookup finds the information about the given content-type, and * returns a cinfo structure so you can look up description and icon. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h index 04954857c0c..5ed576edb57 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/crit.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -15,9 +15,9 @@ * crit.h: Critical section abstraction. Used in threaded servers to protect * areas where two threads can interfere with each other. * - * Condvars are condition variables that are used for thread-thread + * Condvars are condition variables that are used for thread-thread * synchronization. - * + * * Rob McCool */ @@ -33,7 +33,7 @@ typedef void *CRITICAL; #endif /* - * crit_init creates and returns a new critical section variable. At the + * crit_init creates and returns a new critical section variable. At the * time of creation no one has entered it. */ #ifdef USE_NSPR @@ -79,8 +79,8 @@ typedef void* CONDVAR; #endif /* - * condvar_init initializes and returns a new condition variable. You - * must provide a critical section to be associated with this condition + * condvar_init initializes and returns a new condition variable. You + * must provide a critical section to be associated with this condition * variable. */ #ifdef USE_NSPR diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h index 24b44ad0cd0..d3846b6de8b 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/daemon.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * daemon.h: Things related to the accepting connections - * + * * Rob McCool */ @@ -76,10 +76,10 @@ extern int child_serial; /* * daemon_run accepts whether or not it should detach from its parent process, - * and a daemon structure as its arguments. The daemon structure contains - * a port number, a root directory to chroot to (can be NULL), a filename to + * and a daemon structure as its arguments. The daemon structure contains + * a port number, a root directory to chroot to (can be NULL), a filename to * log the daemon pid to (can be NULL). daemon_run never returns. - * + * * child_callback is a function which will be called every time a new * connection is recieved. Session is a new session ID. * diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h index 0a3edb0633e..65ba77dd0e7 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/dll.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * dll.h: Handle dynamically linked libraries - * + * * Rob McCool */ @@ -66,7 +66,7 @@ DLHANDLE dll_open(char *libfn); /* - * dll_findsym looks for a symbol with the given name in the library + * dll_findsym looks for a symbol with the given name in the library * pointed to by the given handle. Returns a pointer to the named function. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h index c10c6ab86b5..8fe585f9e00 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * ereport.h: Records transactions, reports errors to administrators, etc. - * + * * Rob McCool */ @@ -40,13 +40,13 @@ /* A warning is a minor mishap, such as a 404 being issued. */ #define LOG_WARN 0 -/* +/* * A misconfig is when there is a syntax error or permission violation in * a config. file. */ #define LOG_MISCONFIG 1 -/* +/* * Security warnings are issued when authentication fails, or a host is * given a 403 return code. */ @@ -54,14 +54,14 @@ /* * A failure is when a request could not be fulfilled due to an internal - * problem, such as a CGI script exiting prematurely, or a filesystem + * problem, such as a CGI script exiting prematurely, or a filesystem * permissions problem. */ #define LOG_FAILURE 3 /* * A catastrophe is a fatal server error such as running out of - * memory or processes, or a system call failing, or even a server crash. + * memory or processes, or a system call failing, or even a server crash. * The server child cannot recover from a catastrophe. */ #define LOG_CATASTROPHE 4 @@ -88,8 +88,8 @@ /* - * ereport logs an error of the given degree and formats the arguments with - * the printf() style fmt. Returns whether the log was successful. Records + * ereport logs an error of the given degree and formats the arguments with + * the printf() style fmt. Returns whether the log was successful. Records * the current date. */ @@ -99,7 +99,7 @@ int ereport(int degree, char *fmt, ...); * ereport_init initializes the error logging subsystem and opens the static * file descriptors. It returns NULL upon success and an error string upon * error. If a userpw is given, the logs will be chowned to that user. - * + * * email is the address of a person to mail upon catastrophic error. It * can be NULL if no e-mail is desired. ereport_init will not duplicate * its own copy of this string; you must make sure it stays around and free diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h index 8218f875075..ce78bab46be 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -29,18 +29,18 @@ VOID TerminateHttpdLogging(); VOID TerminateHttpsLogging(); VOID LogErrorEvent(PCHAR ServiceName, WORD fwEventType, WORD fwCategory, DWORD IDEvent, - LPTSTR chMsg, LPTSTR lpszMsg); + LPTSTR chMsg, LPTSTR lpszMsg); // Functions in error.c VOID ReportError(PCHAR ErrorMsg); BOOL CALLBACK ErrorDialogProc( - HWND hDlg, - UINT message, - WPARAM wParam, - LPARAM lParam - ); + HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam + ); diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h index f0efb1ee582..fc4d26b32ec 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/file.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * file.h: system specific functions for reading/writing files - * + * * Rob McCool */ @@ -86,7 +86,7 @@ typedef int SYS_FILE; /* * system_fread reads sz bytes from fd into to buf, return number of bytes - * read, or IO_EOF if EOF, or IO_ERROR if error. + * read, or IO_EOF if EOF, or IO_ERROR if error. */ #if defined(FILE_STDIO) diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h index 1a00323cecc..4eb09688d4c 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h index 0454ac69c84..349018ba048 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * net.h: system specific networking definitions - * + * * Rob McCool */ @@ -161,7 +161,7 @@ char *net_find_fqdn(struct hostent *p); * net_ip2host transforms the given textual IP number into a FQDN. If it * can't find a FQDN, it will return what it can get. Otherwise, NULL. * - * verify is whether or not the function should verify the hostname it + * verify is whether or not the function should verify the hostname it * gets. This takes an extra query but is safer for use in access control. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h index c69c553a2a4..e0672366a2a 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nodelock.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -11,14 +11,14 @@ /* ------------------------------------------------------------------------ */ -/* +/* * nodelock.h: licensing stuff */ #ifndef _NODELOCK_H #define _NODELOCK_H -/* +/* * Do the initial IP address check and expiration date check. Reads a file * from admin/config, as #define'd. * @@ -37,7 +37,7 @@ int node_check(void); /* * So how we doin, license - * + * * Returns 1 on error, 0 on AOK */ int node_status(void); diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h index 7c85116faee..d83a3caaf6e 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/nterrors.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -14,9 +14,9 @@ /* DO NOT EDIT THIS FILE - it is automatically generated */ struct _NtError { - int ErrorNumber; - char *ErrorString; - struct _NtError *next; + int ErrorNumber; + char *ErrorString; + struct _NtError *next; } ; typedef struct _NtError NtError; diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h index 7fb14eecf06..09573ffeb03 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/objndx.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -15,7 +15,7 @@ #define __objndx_h /* Define maximum length of object name strings */ -#define OBJNDXNAMLEN 16 +#define OBJNDXNAMLEN 16 /* Functions in objndx.c */ extern void * objndx_create(int size, void (*freefunc)(void *)); diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h index e2d3642a611..dc0c8de76e4 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/pblock.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,33 +13,33 @@ /* * pblock.h: Header for Parameter Block handling functions - * * - * A parameter block is a set of name=value pairs which are generally used - * as parameters, but can be anything. They are kept in a hash table for + * + * A parameter block is a set of name=value pairs which are generally used + * as parameters, but can be anything. They are kept in a hash table for * reasonable speed, but if you are doing any intensive modification or * access of them you should probably make a local copy of each parameter * while working. * * When creating a pblock, you specify the hash table size for that pblock. - * You should set this size larger if you know that many items will be in + * You should set this size larger if you know that many items will be in * that pblock, and smaller if only a few will be used or if speed is not * a concern. * - * The hashing function is very simple right now, and only looks at the + * The hashing function is very simple right now, and only looks at the * first character of name. * * Rob McCool - * + * */ #ifndef PBLOCK_H #define PBLOCK_H /* - * Requires that the macros MALLOC and STRDUP be set to "safe" versions that - * will exit if no memory is available. If not under MCC httpd, define - * them to be the real functions and play with fire, or make your own + * Requires that the macros MALLOC and STRDUP be set to "safe" versions that + * will exit if no memory is available. If not under MCC httpd, define + * them to be the real functions and play with fire, or make your own * function. */ @@ -82,15 +82,15 @@ pb_param *param_create(char *name, char *value); /* * param_free frees a given parameter if it's non-NULL, and returns 1 if * p was non-NULL, and 0 if p was NULL. - * + * * Useful for error checking pblock_remove. */ int param_free(pb_param *pp); -/* +/* * pblock_create creates a new pblock with hash table size n. - * + * * It returns the newly allocated pblock. */ @@ -98,14 +98,14 @@ pblock *pblock_create(int n); /* * pblock_free frees the given pblock and any entries inside it. - * - * If you want to save anything in a pblock, remove its entities with + * + * If you want to save anything in a pblock, remove its entities with * pblock_remove first and save the pointers you get. */ void pblock_free(pblock *pb); -/* +/* * pblock_find finds the entry with the given name in pblock pb. * * If it is successful, it returns the param block. If not, it returns NULL. @@ -130,7 +130,7 @@ char *pblock_findval(char *name, pblock *pb); /* * pblock_nvinsert creates a new parameter with the given name and value * and inserts it into pblock pb. The name and value in the parameter are - * also newly allocated. Returns the pb_param it allocated (in case you + * also newly allocated. Returns the pb_param it allocated (in case you * need it). * * pblock_nninsert inserts a numerical value. @@ -147,18 +147,18 @@ void pblock_pinsert(pb_param *pp, pblock *pb); /* * pblock_str2pblock scans the given string str for parameter pairs - * name=value, or name="value". Any \ must be followed by a literal + * name=value, or name="value". Any \ must be followed by a literal * character. If a string value is found, with no unescaped = signs, it * will be added with the name 1, 2, 3, etc. depending on whether it was * first, second, third, etc. in the stream (zero doesn't count). - * + * * Returns the number of parameters added to the table, or -1 upon error. */ int pblock_str2pblock(char *str, pblock *pb); /* - * pblock_pblock2str places all of the parameters in the given pblock + * pblock_pblock2str places all of the parameters in the given pblock * into the given string (NULL if it needs creation). It will re-allocate * more space for the string. Each parameter is separated by a space and of * the form name="value" @@ -167,7 +167,7 @@ int pblock_str2pblock(char *str, pblock *pb); char *pblock_pblock2str(pblock *pb, char *str); /* - * pblock_copy copies the entries in the given source pblock to the + * pblock_copy copies the entries in the given source pblock to the * destination one. The entries are newly allocated so that the original * pblock may be freed or the new one changed without affecting the other. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h index c6ea65b834b..a6d061b1a5b 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/sem.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * sem.h: Attempt to provide multi-process semaphores across platforms - * + * * Rob McCool */ @@ -37,8 +37,8 @@ typedef int SEMAPHORE; #endif /* SEM_WIN32 */ /* - * sem_init creates a semaphore using the given name and unique - * identification number. filename should be a file accessible to the + * sem_init creates a semaphore using the given name and unique + * identification number. filename should be a file accessible to the * process. Returns SEM_ERROR on error. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h index c404dfa5a8c..4531a34e966 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -72,8 +72,8 @@ void session_free(Session *sn); #define session_dns(sn) session_dns_lookup(sn, 0) /* - * session_maxdns looks up a hostname from an IP address, and then verifies - * that the host is really who they claim to be. + * session_maxdns looks up a hostname from an IP address, and then verifies + * that the host is really who they claim to be. */ #define session_maxdns(sn) session_dns_lookup(sn, 1) diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h index 38b7e4982aa..d7a49a65aaf 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,11 +13,11 @@ /* * shexp.h: Defines and prototypes for shell exp. match routines - * + * * * This routine will match a string with a shell expression. The expressions * accepted are based loosely on the expressions accepted by zsh. - * + * * o * matches anything * o ? matches one character * o \ will escape a special character @@ -30,18 +30,18 @@ * matching the shell expression from the match list * o (foo|bar) will match either the substring foo, or the substring bar. * These can be shell expressions as well. - * + * * The public interface to these routines is documented below. - * + * * Rob McCool - * + * */ #ifndef SHEXP_H #define SHEXP_H /* - * Requires that the macro MALLOC be set to a "safe" malloc that will + * Requires that the macro MALLOC be set to a "safe" malloc that will * exit if no memory is available. If not under MCC httpd, define MALLOC * to be the real malloc and play with fire, or make your own function. */ @@ -58,7 +58,7 @@ /* * shexp_valid takes a shell expression exp as input. It returns: - * + * * NON_SXP if exp is a standard string * INVALID_SXP if exp is a shell expression, but invalid * VALID_SXP if exp is a valid shell expression @@ -71,8 +71,8 @@ int shexp_valid(char *exp); /* - * shexp_match - * + * shexp_match + * * Takes a prevalidated shell expression exp, and a string str. * * Returns 0 on match and 1 on non-match. @@ -83,9 +83,9 @@ int shexp_match(char *str, char *exp); /* * shexp_cmp - * + * * Same as above, but validates the exp first. 0 on match, 1 on non-match, - * -1 on invalid exp. shexp_casecmp does the same thing but is case + * -1 on invalid exp. shexp_casecmp does the same thing but is case * insensitive. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h index ec536cf4d9c..345efe9ad2f 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shmem.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * shmem.h: Portable abstraction for memory shared among a server's workers - * + * * Rob McCool */ @@ -49,8 +49,8 @@ typedef struct { /* * shmem_alloc allocates a region of shared memory of the given size, using * the given name to avoid conflicts between multiple regions within the - * program. The region will not be automatically grown if its boundaries - * are over-run, use shmem_realloc for that. + * program. The region will not be automatically grown if its boundaries + * are over-run, use shmem_realloc for that. * * If expose is non-zero and the underlying system supports it, the * file used to create the shared region will be visible to other processes @@ -59,7 +59,7 @@ typedef struct { * name should be unique to the program which calls this routine, otherwise * conflicts will arise. * - * Returns a new shared memory region, with the data element being a + * Returns a new shared memory region, with the data element being a * pointer to the shared memory. This function must be called before any * daemon workers are spawned, in order for the handle to the shared region * to be inherited by the children. diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h index b54f085e6a9..5635625e2bb 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systems.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,8 +13,8 @@ /* * systems.h: Lists of defines for systems - * - * This sets what general flavor the system is (UNIX, etc.), + * + * This sets what general flavor the system is (UNIX, etc.), * and defines what extra functions your particular system needs. */ @@ -209,12 +209,12 @@ typedef void* PASSWD; /* The stat call under NT doesn't define these macros */ #define S_ISDIR(mode) ((mode&S_IFMT) == S_IFDIR) -#define S_ISREG(mode) ((mode&S_IFMT) == S_IFREG) +#define S_ISREG(mode) ((mode&S_IFMT) == S_IFREG) #define strcasecmp util_strcasecmp #define strncasecmp util_strncasecmp int util_strcasecmp(const char *s1, const char *s2); int util_strncasecmp(const char *s1, const char *s2, int n); -#endif /* Windows NT */ +#endif /* Windows NT */ #endif diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h index 81e101076f9..f359b8b9a64 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/systhr.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * systhr.h: Abstracted threading mechanisms - * + * * Rob McCool */ @@ -46,14 +46,14 @@ typedef sys_thread_s *SYS_THREAD; /* * systhread_start creates a thread with the given priority, will allocate * a stack of stksz bytes, and calls fn with arg as its argument. stksz - * of zero will allocate a default stack size. - * + * of zero will allocate a default stack size. + * * XXX Priorities are system dependent */ SYS_THREAD systhread_start(int prio, int stksz, void (*fn)(void *), void *arg); -/* +/* * systhread_current returns a pointer to the current thread. */ #ifdef USE_NSPR @@ -69,7 +69,7 @@ SYS_THREAD systhread_start(int prio, int stksz, void (*fn)(void *), void *arg); SYS_THREAD systhread_attach(); -/* +/* * systhread_terminate terminates the thread that is passed in. */ void systhread_terminate(SYS_THREAD thr); @@ -105,7 +105,7 @@ void systhread_init(char *name); /* * newkey allocates a new integer id for thread-private data. Use this - * key to identify a variable which you want to appear differently + * key to identify a variable which you want to appear differently * between threads, and then use setdata to associate a value with this * key for each thread. */ @@ -113,7 +113,7 @@ int systhread_newkey(void); /* * Get data that has been previously associated with key in this thread. - * Returns NULL if setkey has not been called with this key by this + * Returns NULL if setkey has not been called with this key by this * thread previously, or the data that was previously used with setkey * by this thread with this key. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h index cf2f1c0764d..17972cb518a 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/util.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -12,9 +12,9 @@ /* - * util.h: A hodge podge of utility functions and standard functions which + * util.h: A hodge podge of utility functions and standard functions which * are unavailable on certain systems - * + * * Rob McCool */ @@ -33,7 +33,7 @@ /* * getline scans in buf until it finds a LF or CRLF, storing the string in * l. It will terminate the string and return: - * + * * 0 when done, with the scanned line (minus CR or LF) in l * 1 upon EOF, with the scanned line (minus CR or LF) in l * -1 on error with the error description in l (uses lineno for information) @@ -43,7 +43,7 @@ int util_getline(filebuf *buf, int lineno, int maxlen, char *l); /* - * can_exec returns 1 if you can execute the file described by finfo, and + * can_exec returns 1 if you can execute the file described by finfo, and * 0 if you can't. */ @@ -58,7 +58,7 @@ int util_can_exec(struct stat *finfo, uid_t uid, gid_t gid); * env_create creates a new environment with the given env, with n new * entries, and places the current position that you should add your * entries with at pos. - * + * * If env is NULL, it will allocate a new one. If not, it will reallocate * that one. */ @@ -73,7 +73,7 @@ char **util_env_create(char **env, int n, int *pos); char *util_env_str(char *name, char *value); /* - * env_replace replaces the occurrence of the given variable with the + * env_replace replaces the occurrence of the given variable with the * value you give. */ @@ -110,25 +110,25 @@ int util_chdir2path(char *path); /* * is_mozilla checks if the given user-agent is mozilla, of at least - * the given major and minor revisions. These are strings to avoid + * the given major and minor revisions. These are strings to avoid * ambiguities like 1.56 > 1.5 */ int util_is_mozilla(char *ua, char *major, char *minor); /* - * is_url will return 1 if the given string seems to be a URL, or will - * return 0 otherwise. - * - * Because of stupid news URLs, this will return 1 if the string has - * all alphabetic characters up to the first colon and will not check for + * is_url will return 1 if the given string seems to be a URL, or will + * return 0 otherwise. + * + * Because of stupid news URLs, this will return 1 if the string has + * all alphabetic characters up to the first colon and will not check for * the double slash. */ int util_is_url(char *url); /* - * util_later_than checks the date in the string ims, and if that date is + * util_later_than checks the date in the string ims, and if that date is * later than or equal to the one in the tm struct lms, then it returns 1. * * Handles RFC 822, 850, and ctime formats. @@ -144,7 +144,7 @@ int util_uri_is_evil(char *t); /* * util_uri_parse gets rid of /../, /./, and //. - * + * * Assumes that either the string starts with a /, or the string will * not .. right off of its beginning. As such, ../foo.gif will * not be changed, although /../foo.gif will become /foo.gif. @@ -163,7 +163,7 @@ void util_uri_unescape(char *s); * If d is NULL, it will allocate and return a properly sized string. * Warning: does not check bounds on a given d. * - * util_url_escape does the same thing but does it for a url, i.e. ?:+ is + * util_url_escape does the same thing but does it for a url, i.e. ?:+ is * not escaped. */ @@ -184,9 +184,9 @@ char *util_sh_escape(char *s); int util_itoa(int i, char *a); /* - * util_vsprintf and util_sprintf are simplified clones of the System V + * util_vsprintf and util_sprintf are simplified clones of the System V * vsprintf and sprintf routines. - * + * * Returns the number of characters printed. Only handles %d and %s, * does not handle any width or precision. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h index ec632f2d84b..79a8b84dbbc 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,12 +13,12 @@ /* * conf.h: Deals with the server configuration file. - * + * * Object configuration is an entirely different matter. This deals with * things like what port the server runs on, how many children it spawns, * and other server-related issues. Information related configuration is * handled by the object conf. - * + * * Rob McCool */ @@ -67,7 +67,7 @@ /* * These server parameters are made global because they really don't - * belong anywhere else. + * belong anywhere else. */ #if defined(DAEMON_ANY) @@ -145,7 +145,7 @@ void conf_terminate(void); /* - * conf_vars2daemon transfers these globals to a daemon structure + * conf_vars2daemon transfers these globals to a daemon structure */ void conf_vars2daemon(daemon_s *d); diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h index 3904af7b37c..63545df5ad1 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/dnfilter.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -15,22 +15,22 @@ #define __dnfilter_h /* Error codes */ -#define DNFERR_MAX (-1) /* maximum error code */ -#define DNFERR_MALLOC (-1) /* insufficient memory */ -#define DNFERR_FOPEN (-2) /* file open error */ -#define DNFERR_FILEIO (-3) /* file I/O error */ -#define DNFERR_DUPSPEC (-4) /* duplicate filter specification */ -#define DNFERR_INTERR (-5) /* internal error (bug) */ -#define DNFERR_SYNTAX (-6) /* syntax error in filter file */ -#define DNFERR_MIN (-6) /* minimum error code */ +#define DNFERR_MAX (-1) /* maximum error code */ +#define DNFERR_MALLOC (-1) /* insufficient memory */ +#define DNFERR_FOPEN (-2) /* file open error */ +#define DNFERR_FILEIO (-3) /* file I/O error */ +#define DNFERR_DUPSPEC (-4) /* duplicate filter specification */ +#define DNFERR_INTERR (-5) /* internal error (bug) */ +#define DNFERR_SYNTAX (-6) /* syntax error in filter file */ +#define DNFERR_MIN (-6) /* minimum error code */ /* This is used to return error information from dns_filter_setup() */ typedef struct DNSFilterErr_s DNSFilterErr_t; struct DNSFilterErr_s { - int errNo; /* DNFERR_xxxx error code */ - int lineno; /* file line number, if applicable */ - char * filename; /* filename, if applicable */ - char * errstr; /* error text, if any */ + int errNo; /* DNFERR_xxxx error code */ + int lineno; /* file line number, if applicable */ + char * filename; /* filename, if applicable */ + char * errstr; /* error text, if any */ }; /* Data and functions in dnfilter.c */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h index 45383c76d23..7bce6c285ba 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/func.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,11 +13,11 @@ /* * func.h: Handles the function hash table - * + * * httpd uses a table of internal functions hashed by a name string such that * users can reference specific functions from the configuration files. - * - * Any function referenced by configuration files will be passed a + * + * Any function referenced by configuration files will be passed a * parameter, a Request structure. The functions do not return anything. * * Rob McCool @@ -44,8 +44,8 @@ typedef int Func(pblock *, Session *, Request *); typedef Func *FuncPtr; /* - * FuncStruct is a structure used in the static declaration of the - * functions. This static declaration is parsed into a hash table at + * FuncStruct is a structure used in the static declaration of the + * functions. This static declaration is parsed into a hash table at * startup. You should initialize the next entry to NULL. */ @@ -59,7 +59,7 @@ struct FuncStruct { /* --------------------------- Hash definitions --------------------------- */ -/* +/* * This is a primitive hash function. Once more is known about the names of * the functions, this will be optimized. */ @@ -72,7 +72,7 @@ struct FuncStruct { /* - * func_init reads the static FuncStruct arrays and creates the global + * func_init reads the static FuncStruct arrays and creates the global * function table from them. * * func_init will only read from the static arrays defined in func.c. @@ -91,7 +91,7 @@ FuncPtr func_find(char *name); * func_exec will try to execute the function whose name is the "fn" entry * in the given pblock. If name is not found, it will log a misconfig of * missing fn parameter. If it can't find it, it will log that. In these - * cases it will return REQ_ABORTED. Otherwise, it will return what the + * cases it will return REQ_ABORTED. Otherwise, it will return what the * function being executed returns. */ @@ -99,8 +99,8 @@ int func_exec(pblock *pb, Session *sn, Request *rq); /* * func_insert dynamically inserts a named function into the server's - * table of functions. Returns the FuncStruct it keeps in internal - * databases, because on server restart you are responsible for freeing + * table of functions. Returns the FuncStruct it keeps in internal + * databases, because on server restart you are responsible for freeing * (or not) its contents. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h index bc23879ebe8..c139d536482 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/http.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * http.h: Deals with HTTP-related issues - * + * * Rob McCool */ @@ -78,7 +78,7 @@ int http_parse_request(char *t, Request *rq, Session *sn); /* * Scans HTTP headers from the given netbuf, and places them in headers. * If netbuf is NULL, the session's inbuf is used. - * + * * Folded lines are joined and the linefeed removed (but not the whitespace). * If there are any repeat headers they are joined and the two field bodies * separated by a comma and space. @@ -106,7 +106,7 @@ int http_start_response(Session *sn, Request *rq); /* * http_hdrs2env takes the entries from the given pblock and converts them - * to an environment. + * to an environment. * * Each name entry will be made uppercase, prefixed with HTTP_ and any * occurrence of - will be converted to _. @@ -133,7 +133,7 @@ int http_set_finfo(Session *sn, Request *rq, struct stat *finfo); /* - * Takes the given pblock and prints headers into the given buffer at + * Takes the given pblock and prints headers into the given buffer at * position pos. Returns the buffer, reallocated if needed. Modifies pos. */ @@ -155,10 +155,10 @@ void http_finish_request(Session *sn, Request *rq); void http_handle_session(Session *sn); /* - * http_uri2url takes the give URI prefix and URI suffix and creates a + * http_uri2url takes the give URI prefix and URI suffix and creates a * newly-allocated full URL from them of the form * http://(server):(port)(prefix)(suffix) - * + * * If you want either prefix or suffix to be skipped, use "" instead of NULL. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h index efc6d1202e3..ee50b8a7821 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * httpact.h: Defines the API characteristics for HTTP servers - * + * * Rob McCool */ @@ -44,7 +44,7 @@ /* * directive_name2num will return the position of the abbreviated directive * dir in the directive table. - * + * * If dir does not exist in the table, it will return -1. */ @@ -113,6 +113,6 @@ struct hostent *servact_gethostbyname(char *host, Session *sn, Request *rq); int servact_connect(char *host, int port, Session *sn, Request *rq); -#endif /* ! MCC_PROXY */ +#endif /* ! MCC_PROXY */ #endif diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h index a0aa92e3ac9..a5d490798c3 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/ipfilter.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -15,15 +15,15 @@ #define __ipfilter_h /* Define error codes */ -#define IPFERR_MAX (-1) /* maximum error code value */ -#define IPFERR_MALLOC (-1) /* insufficient memory */ -#define IPFERR_FOPEN (-2) /* file open error */ -#define IPFERR_FILEIO (-3) /* file I/O error */ -#define IPFERR_DUPSPEC (-4) /* duplicate filter specification */ -#define IPFERR_INTERR (-5) /* internal error (bug) */ -#define IPFERR_SYNTAX (-6) /* syntax error in filter file */ -#define IPFERR_CNFLICT (-7) /* conflicting filter specification */ -#define IPFERR_MIN (-7) /* minimum error code value */ +#define IPFERR_MAX (-1) /* maximum error code value */ +#define IPFERR_MALLOC (-1) /* insufficient memory */ +#define IPFERR_FOPEN (-2) /* file open error */ +#define IPFERR_FILEIO (-3) /* file I/O error */ +#define IPFERR_DUPSPEC (-4) /* duplicate filter specification */ +#define IPFERR_INTERR (-5) /* internal error (bug) */ +#define IPFERR_SYNTAX (-6) /* syntax error in filter file */ +#define IPFERR_CNFLICT (-7) /* conflicting filter specification */ +#define IPFERR_MIN (-7) /* minimum error code value */ /* Define a scalar IP address value */ typedef unsigned long IPAddr_t; @@ -31,10 +31,10 @@ typedef unsigned long IPAddr_t; /* Define structure for returning error information */ typedef struct IPFilterErr_s IPFilterErr_t; struct IPFilterErr_s { - int errNo; /* IPFERR_xxxx error code */ - int lineno; /* file line number, if applicable */ - char * filename; /* filename, if applicable */ - char * errstr; /* error text, if any */ + int errNo; /* IPFERR_xxxx error code */ + int lineno; /* file line number, if applicable */ + char * filename; /* filename, if applicable */ + char * errstr; /* error text, if any */ }; /* Data and functions in ipfilter.c */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h index 2641e87246c..6666b336c15 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/log.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * log.h: Records transactions, reports errors to administrators, etc. - * + * * Rob McCool */ @@ -43,7 +43,7 @@ * will be reported. */ -int log_error(int degree, char *func, Session *sn, Request *rq, +int log_error(int degree, char *func, Session *sn, Request *rq, char *fmt, ...); #endif diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h index d7d49816280..40a1590e913 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,17 +13,17 @@ /* * object.h: Handle httpd objects - * + * * Manages information about a document from config. files. Called mainly * by objset.c. - * + * * This module does not assume anything about the directives being parsed. * That is handled by objset.c. - * + * * This module requires the pblock module from the base library. - * + * * Rob McCool - * + * */ @@ -53,8 +53,8 @@ /* * Hierarchy of httpd_object * - * An object contains dtables. - * + * An object contains dtables. + * * Each dtable is a table of directives that were entered of a certain type. * There is one dtable for each unique type of directive. * @@ -93,7 +93,7 @@ typedef struct { * * The name pblock array contains the names for this object, such as its * virtual location, its physical location, or its identifier. - * + * * tmpl contains any templates allocated to this object. */ @@ -113,7 +113,7 @@ typedef struct { /* * directive_name2num will return the position of the abbreviated directive * dir in the directive table. - * + * * If dir does not exist in the table, it will return -1. */ @@ -141,7 +141,7 @@ httpd_object *object_create(int nd, pblock *name); void object_free(httpd_object *obj); /* - * object_add_directive will add a new directive to the dtable for + * object_add_directive will add a new directive to the dtable for * the directive class at position dc. */ @@ -150,7 +150,7 @@ void object_add_directive(int dc, pblock *p, pblock *c, httpd_object *obj); /* * object_findnext finds the object configured to follow the given object, - * and stores the variables in rq->vars. It returns REQ_PROCEED if more + * and stores the variables in rq->vars. It returns REQ_PROCEED if more * objects should be processed, or REQ_NOACTION if it did not find any * further objects to process. If something bad happens, REQ_ABORTED is * returned. diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h index f7e07ef243b..6022433e27d 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,11 +13,11 @@ /* * objset.h: Handles object sets - * + * * Each object is produced by reading a config file of some form. See the - * server documentation for descriptions of the directives that are + * server documentation for descriptions of the directives that are * recognized, what they do, and how they are parsed. - * + * * This module requires the pblock and buffer modules from the base library. * * Rob McCool @@ -42,9 +42,9 @@ /* ------------------------------ Constants ------------------------------- */ -/* +/* * The default number of objects to leave room for in an object set, - * and the number of new entries by which to increase the size when that + * and the number of new entries by which to increase the size when that * room is filled. */ @@ -53,7 +53,7 @@ /* * When parsing config. files, httpd will put a limit on how long * the parameters to a directive can be (in characters). - * + * * Currently set to 10 lines (80 chars/line). */ @@ -70,7 +70,7 @@ /* - * httpd_objset is a container for a bunch of objects. obj is a + * httpd_objset is a container for a bunch of objects. obj is a * NULL-terminated array of objects. pos points to the entry after the last * one in the array. You should not mess with pos, but can read it to find * the last entry. @@ -86,8 +86,8 @@ typedef struct { /* - * objset_scan_buffer will scan through buffer, looking for object - * configuration information, and adding them to the object set os if it + * objset_scan_buffer will scan through buffer, looking for object + * configuration information, and adding them to the object set os if it * finds any. If os is NULL it will allocate a new object set. * * If any error occurs (syntax error, premature EOF) this function will @@ -121,7 +121,7 @@ void objset_free_setonly(httpd_objset *os); /* * objset_new_object will add a new object to objset with the specified - * name. It returns a pointer to the new object (which may be anywhere in + * name. It returns a pointer to the new object (which may be anywhere in * the objset). */ @@ -139,16 +139,16 @@ void objset_add_object(httpd_object *obj, httpd_objset *os); * ign is a set of objects to ignore. */ -httpd_object *objset_findbyname(char *name, httpd_objset *ign, +httpd_object *objset_findbyname(char *name, httpd_objset *ign, httpd_objset *os); /* - * objset_findbyppath will find the object in objset having the given + * objset_findbyppath will find the object in objset having the given * partial path entry. Returns object if found, NULL otherwise. * ign is a set of objects to ignore. */ -httpd_object *objset_findbyppath(char *ppath, httpd_objset *ign, +httpd_object *objset_findbyppath(char *ppath, httpd_objset *ign, httpd_objset *os); diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h index a57d9fc7aa4..bf7f6ec3e4d 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/protocol.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -12,10 +12,10 @@ /* - * protocol.h: Switch which protocol we're speaking. - * + * protocol.h: Switch which protocol we're speaking. + * * Currently only HTTP, but expected to include MTP in the future. - * + * * Rob McCool */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h index 46ff5e2d4fb..e198ce22df8 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -13,7 +13,7 @@ /* * req.h: Request-specific data structures and functions - * + * * Rob McCool */ @@ -37,7 +37,7 @@ #define REQ_HASHSIZE 10 #define REQ_MAX_LINE 4096 - + /* * The REQ_ return codes. These codes are used to determine what the server * should do after a particular module completes its task. @@ -108,7 +108,7 @@ void request_free(Request *req); /* * Restarts a request for a given URI internally. If rq is non-NULL, the - * function will keep the old request's headers and protocol, but with a new + * function will keep the old request's headers and protocol, but with a new * URI and method of GET. If the previous method was HEAD, this is preserved. * Any other method becomes GET. You may assume that if you give it a request * structure that it will use the same structure. @@ -122,7 +122,7 @@ Request *request_restart_internal(char *uri, Request *rq); /* * request_translate_uri performs virtual to physical mapping on the given - * uri and returns either a path string or NULL depending on whether it was + * uri and returns either a path string or NULL depending on whether it was * successful or not. */ @@ -130,8 +130,8 @@ char *request_translate_uri(char *uri, Session *sn); /* - * request_header finds the named header depending on the requesting - * protocol. If possible, it will not load headers until the first is + * request_header finds the named header depending on the requesting + * protocol. If possible, it will not load headers until the first is * requested. You have to watch out because this can return REQ_ABORTED. */ @@ -146,9 +146,9 @@ int request_loadheaders(Session *sn, Request *rq); /* * request_stat_path tries to stat path. If path is NULL, it will look in - * the vars pblock for "path". If the stat is successful, it returns the stat - * structure. If not, returns NULL and leaves a message in rq->staterr. If a - * previous call to this function was successful, and path is the same, the + * the vars pblock for "path". If the stat is successful, it returns the stat + * structure. If not, returns NULL and leaves a message in rq->staterr. If a + * previous call to this function was successful, and path is the same, the * function will simply return the previously found value. * * User functions should not free this structure. @@ -178,7 +178,7 @@ int request_fileinfo(Session *sn, Request *rq); /* - * request_handle_processed takes a Request structure with its reqpb + * request_handle_processed takes a Request structure with its reqpb * block filled in and handles the request. */ @@ -200,7 +200,7 @@ int request_service(Session *sn, Request *rq); void request_handle(Session *sn); /* - * Moved here due to problems with interdependency. See object.h for + * Moved here due to problems with interdependency. See object.h for * description. */ diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h index 79c7e3f5347..292ca95d732 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/servact.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. @@ -12,7 +12,7 @@ /* - * servact.h: Define the server's actions, depending on what type of + * servact.h: Define the server's actions, depending on what type of * server it is. * * Rob McCool diff --git a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h index 61d51923500..68983c7aeae 100644 --- a/apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h +++ b/apps/JAWS/clients/WebSTONE/src/nsapi-includes/netsite.h @@ -1,7 +1,7 @@ /* * Copyright (c) 1994, 1995. Netscape Communications Corporation. All * rights reserved. - * + * * Use of this software is governed by the terms of the license agreement for * the Netscape Communications or Netscape Comemrce Server between the * parties. diff --git a/apps/JAWS/clients/WebSTONE/src/parse_file_list.h b/apps/JAWS/clients/WebSTONE/src/parse_file_list.h index 6733c0ec638..ce2767105e6 100644 --- a/apps/JAWS/clients/WebSTONE/src/parse_file_list.h +++ b/apps/JAWS/clients/WebSTONE/src/parse_file_list.h @@ -13,7 +13,7 @@ extern int count_file_list(const char *); -extern void parse_file_list (char *, page_list_t *, - long int *, long int *); +extern void parse_file_list (char *, page_list_t *, + long int *, long int *); #endif /* !__PARSE_FILE_LIST_H__ */ diff --git a/apps/JAWS/clients/WebSTONE/src/statistics.h b/apps/JAWS/clients/WebSTONE/src/statistics.h index c1693d8fc34..75b6be86e87 100644 --- a/apps/JAWS/clients/WebSTONE/src/statistics.h +++ b/apps/JAWS/clients/WebSTONE/src/statistics.h @@ -4,8 +4,8 @@ #ifndef _STATISTICS_H_ #define _STATISTICS_H_ -extern double mean(const double, const int); -extern double variance(const double, const double, const int); -extern double stddev(const double, const double, const int); +extern double mean(const double, const int); +extern double variance(const double, const double, const int); +extern double stddev(const double, const double, const int); #endif /* ! _STATISTICS_H_ */ diff --git a/apps/JAWS/clients/WebSTONE/src/sysdep.h b/apps/JAWS/clients/WebSTONE/src/sysdep.h index 03c6602789b..5b6e533291e 100644 --- a/apps/JAWS/clients/WebSTONE/src/sysdep.h +++ b/apps/JAWS/clients/WebSTONE/src/sysdep.h @@ -1,14 +1,14 @@ -#ifndef __SYSDEP_H__ +#ifndef __SYSDEP_H__ #define __SYSDEP_H__ /************************************************************************** - * $Header$ * - * Copyright (C) 1995 Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs were * + * $Header$ * + * Copyright (C) 1995 Silicon Graphics, Inc. * + * * + * These coded instructions, statements, and computer programs were * * developed by SGI for public use. If any changes are made to this code* * please try to get the changes back to the author. Feel free to make * - * modifications and changes to the code and release it. * - * * + * modifications and changes to the code and release it. * + * * **************************************************************************/ /* include config.h, output from autoconf */ @@ -36,87 +36,87 @@ /* encapsulation of minor UNIX/WIN NT differences */ #ifdef WIN32 -#define NETREAD(sock, buf, len) recv(sock, buf, len, 0) -#define NETWRITE(sock, buf, len) send(sock, buf, len, 0) -#define NETCLOSE(sock) closesocket(sock) -#define BADSOCKET(sock) ((sock) == INVALID_SOCKET) -#define BADSOCKET_ERRNO(sock) BADSOCKET(sock) -#define BADSOCKET_VALUE INVALID_SOCKET -#define S_ADDR S_un.S_addr +#define NETREAD(sock, buf, len) recv(sock, buf, len, 0) +#define NETWRITE(sock, buf, len) send(sock, buf, len, 0) +#define NETCLOSE(sock) closesocket(sock) +#define BADSOCKET(sock) ((sock) == INVALID_SOCKET) +#define BADSOCKET_ERRNO(sock) BADSOCKET(sock) +#define BADSOCKET_VALUE INVALID_SOCKET +#define S_ADDR S_un.S_addr #ifdef USE_TIMEZONE #error NT gettimeofday() doesn't support USE_TIMEZONE (yet) #else -#define GETTIMEOFDAY(timeval, tz) gettimeofday(timeval) +#define GETTIMEOFDAY(timeval, tz) gettimeofday(timeval) #endif /* USE_TIMEZONE */ -typedef unsigned short NETPORT; -#define SRANDOM srand +typedef unsigned short NETPORT; +#define SRANDOM srand #define RANDOM_R rand_r -#define RANDOM rand -#define THREAD __declspec ( thread ) -#define PROGPATH "c:\\webstone\\webclient" -#define FILENAME_SIZE 256 -#define HAVE_VPRINTF 1 +#define RANDOM rand +#define THREAD __declspec ( thread ) +#define PROGPATH "c:\\webstone\\webclient" +#define FILENAME_SIZE 256 +#define HAVE_VPRINTF 1 -#define SIGCHLD 0 /* dummy value */ -#define SIGALRM 0 /* dummy value */ -typedef int pid_t; -typedef unsigned short ushort; -#define MAXPATHLEN 512 +#define SIGCHLD 0 /* dummy value */ +#define SIGALRM 0 /* dummy value */ +typedef int pid_t; +typedef unsigned short ushort; +#define MAXPATHLEN 512 #else /* not WIN32 */ -#define NETREAD(sock, buf, len) read(sock, buf, len) -#define NETWRITE(sock, buf, len) write(sock, buf, len) -#define NETCLOSE(sock) close(sock) -#define BADSOCKET(sock) ((sock) < 0) -#define BADSOCKET_ERRNO(sock) (BADSOCKET(sock) || errno) -#define BADSOCKET_VALUE (-1) -#define S_ADDR s_addr +#define NETREAD(sock, buf, len) read(sock, buf, len) +#define NETWRITE(sock, buf, len) write(sock, buf, len) +#define NETCLOSE(sock) close(sock) +#define BADSOCKET(sock) ((sock) < 0) +#define BADSOCKET_ERRNO(sock) (BADSOCKET(sock) || errno) +#define BADSOCKET_VALUE (-1) +#define S_ADDR s_addr #ifdef USE_TIMEZONE -#define GETTIMEOFDAY(timeval,tz) gettimeofday(timeval, NULL) +#define GETTIMEOFDAY(timeval,tz) gettimeofday(timeval, NULL) #else -#define GETTIMEOFDAY(timeval,tz) gettimeofday(timeval, tz) +#define GETTIMEOFDAY(timeval,tz) gettimeofday(timeval, tz) #endif /* USE_TIMEZONE */ -typedef unsigned short NETPORT; -#define SRANDOM srandom -#define RANDOM random -#define THREAD -#define PROGPATH "/tmp/webclient" /* "/usr/local/bin/webclient" */ -#define FILENAME_SIZE 1024 -#define HAVE_VPRINTF 1 - -typedef int SOCKET; -#define min(a,b) (((a) < (b)) ? a : b) -#define max(a,b) (((a) > (b)) ? a : b) +typedef unsigned short NETPORT; +#define SRANDOM srandom +#define RANDOM random +#define THREAD +#define PROGPATH "/tmp/webclient" /* "/usr/local/bin/webclient" */ +#define FILENAME_SIZE 1024 +#define HAVE_VPRINTF 1 + +typedef int SOCKET; +#define min(a,b) (((a) < (b)) ? a : b) +#define max(a,b) (((a) > (b)) ? a : b) #endif /* WIN32 */ /* function prototypes */ #ifdef WIN32 -int getopt(int argc, char ** argv, char *opts); -int getpid(void); -int gettimeofday(struct timeval *curTimeP); -int random_number(int max); -SOCKET rexec(const char **hostname, NETPORT port, char *username, char *password, - char *command, SOCKET *sockerr); -void sleep(int secs); +int getopt(int argc, char ** argv, char *opts); +int getpid(void); +int gettimeofday(struct timeval *curTimeP); +int random_number(int max); +SOCKET rexec(const char **hostname, NETPORT port, char *username, char *password, + char *command, SOCKET *sockerr); +void sleep(int secs); #else #ifdef NO_REXEC -extern int rexec(char **, int, char *, char *, char *, int *); -#endif +extern int rexec(char **, int, char *, char *, char *, int *); +#endif #endif /* WIN32 */ #ifndef HAVE_STRERROR /* strerror() is not available on SunOS 4.x and others */ -char *strerror(int errnum); +char *strerror(int errnum); #endif /* strerror() */ diff --git a/apps/JAWS/clients/WebSTONE/src/timefunc.h b/apps/JAWS/clients/WebSTONE/src/timefunc.h index a1514358316..5690a2aafab 100644 --- a/apps/JAWS/clients/WebSTONE/src/timefunc.h +++ b/apps/JAWS/clients/WebSTONE/src/timefunc.h @@ -1,30 +1,30 @@ /************************************************************************** $Header$ - * Copyright (C) 1995 Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs were * + * Copyright (C) 1995 Silicon Graphics, Inc. * + * * + * These coded instructions, statements, and computer programs were * * developed by SGI for public use. If any changes are made to this code* * please try to get the changes back to the author. Feel free to make * - * modifications and changes to the code and release it. * - * * + * modifications and changes to the code and release it. * + * * **************************************************************************/ #ifndef __TIMEFUNC_H__ #define __TIMEFUNC_H__ -extern double timevaldouble(struct timeval *); -extern void doubletimeval(const double, struct timeval *); +extern double timevaldouble(struct timeval *); +extern void doubletimeval(const double, struct timeval *); -extern void addtime(struct timeval *, struct timeval *); -extern void compdifftime(struct timeval *, struct timeval *, struct timeval *); -extern void mintime(struct timeval *, struct timeval *); -extern void maxtime(struct timeval *, struct timeval *); -extern void avgtime(struct timeval *, int, struct timeval *); -extern void variancetime(struct timeval *, double, int, struct timeval *); -extern void stddevtime(struct timeval *, double, int, struct timeval *); +extern void addtime(struct timeval *, struct timeval *); +extern void compdifftime(struct timeval *, struct timeval *, struct timeval *); +extern void mintime(struct timeval *, struct timeval *); +extern void maxtime(struct timeval *, struct timeval *); +extern void avgtime(struct timeval *, int, struct timeval *); +extern void variancetime(struct timeval *, double, int, struct timeval *); +extern void stddevtime(struct timeval *, double, int, struct timeval *); -extern void sqtime(struct timeval *, struct timeval *); +extern void sqtime(struct timeval *, struct timeval *); -extern double thruputpersec(const double, struct timeval *); +extern double thruputpersec(const double, struct timeval *); #endif /* !__TIMEFUNC_H__ */ diff --git a/apps/JAWS/remora/app/Remora_Export.h b/apps/JAWS/remora/app/Remora_Export.h index 379f3bb1a82..484cfd238d4 100644 --- a/apps/JAWS/remora/app/Remora_Export.h +++ b/apps/JAWS/remora/app/Remora_Export.h @@ -1,13 +1,13 @@ // $Id // =================================================================== -// +// // = FILENAME // Remora_Export.h // // = AUTHOR // Seth Widoff -// +// // =================================================================== @@ -24,24 +24,24 @@ class Remora_Export { public: - + Remora_Export(const char* label = NO_NAME, int value = 0, - int max_value = MAX_VALUE); + int max_value = MAX_VALUE); Remora_Export(const Remora_Export& export); ~Remora_Export(); - + void operator=(const int new_value); void operator=(const Remora_Export& export); - void operator+=(const int new_value); + void operator+=(const int new_value); void operator+=(const Remora_Export& export); - void operator*=(const int new_value); + void operator*=(const int new_value); void operator*=(const Remora_Export& export); - void operator/=(const int new_value); + void operator/=(const int new_value); void operator/=(const Remora_Export& export); void operator-=(const int new_value); @@ -49,19 +49,19 @@ public: operator CORBA::Long() const; operator CORBA::Long&(); - + friend int operator==(const Remora_Export& me, const int new_value); friend int operator==(const Remora_Export& me, const Remora_Export& export); friend int operator!=(const Remora_Export& me, const int new_value); friend int operator!=(const Remora_Export& me, const Remora_Export& export); - + friend int operator<=(const Remora_Export& me, const int new_value); friend int operator<=(const Remora_Export& me, const Remora_Export& export); - + friend int operator>=(const Remora_Export& me, const int new_value); friend int operator>=(const Remora_Export& me, const Remora_Export& export); - + friend int operator<(const Remora_Export& me, const int new_value); friend int operator<(const Remora_Export& me, const Remora_Export& export); @@ -71,13 +71,13 @@ public: private: void init(); - + void update_value(int new_value); remora::Statistic stat_; - + remora::Remora_Statistics_Agent_ptr remora_agent_; - + }; #include "Remora_Export.i" diff --git a/apps/JAWS/remora/app/Remora_Import.h b/apps/JAWS/remora/app/Remora_Import.h index 8cfecd84ac4..a41a1826448 100644 --- a/apps/JAWS/remora/app/Remora_Import.h +++ b/apps/JAWS/remora/app/Remora_Import.h @@ -1,13 +1,13 @@ // $Id // =================================================================== -// +// // = FILENAME // Remora_Import.h // // = AUTHOR // Seth Widoff -// +// // =================================================================== #ifndef REMORA_IMPORT_H @@ -25,14 +25,14 @@ class Remora_Import public: Remora_Import(const char * label = NO_NAME, int value = 0, - int min_value = 0, int max_value = MAX_VALUE); + int min_value = 0, int max_value = MAX_VALUE); Remora_Import(const Remora_Import& import); ~Remora_Import(); CORBA::Long get(void); - + operator CORBA::Long(); friend int operator==( Remora_Import& me, int new_value); @@ -40,13 +40,13 @@ public: friend int operator!=( Remora_Import& me, int new_value); friend int operator!=( Remora_Import& me, Remora_Import& export); - + friend int operator<=( Remora_Import& me, int new_value); friend int operator<=( Remora_Import& me, Remora_Import& export); - + friend int operator>=( Remora_Import& me, int new_value); friend int operator>=( Remora_Import& me, Remora_Import& export); - + friend int operator<( Remora_Import& me, int new_value); friend int operator<( Remora_Import& me, Remora_Import& export); @@ -62,7 +62,7 @@ private: remora::Control control_; remora::Remora_Controls_Agent_ptr remora_agent_; - + }; #include "Remora_Import.i" diff --git a/apps/JAWS/server/HTTP_Config.h b/apps/JAWS/server/HTTP_Config.h index fc8adacb0a1..1f978972750 100644 --- a/apps/JAWS/server/HTTP_Config.h +++ b/apps/JAWS/server/HTTP_Config.h @@ -6,13 +6,13 @@ // // = LIBRARY // jaws -// +// // = FILENAME // HTTP_Config.h // // = AUTHOR // James Hu -// +// // ============================================================================ // = Forward declaration. diff --git a/apps/JAWS/server/HTTP_Handler.h b/apps/JAWS/server/HTTP_Handler.h index 0865ee326ae..0a61ae88782 100644 --- a/apps/JAWS/server/HTTP_Handler.h +++ b/apps/JAWS/server/HTTP_Handler.h @@ -6,16 +6,16 @@ // // = LIBRARY // jaws -// +// // = FILENAME // HTTP_Handler.h // // = AUTHOR // James Hu and Irfan Pyarali -// +// // ============================================================================ -#if !defined (HTTP_HANDLER_H) +#ifndef HTTP_HANDLER_H #define HTTP_HANDLER_H // = Forward declarations @@ -23,22 +23,27 @@ class Message_Block; class HTTP_Handler_Factory; #include "ace/Asynch_IO.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "HTTP_Request.h" #include "HTTP_Response.h" #include "IO.h" class HTTP_Handler : protected JAWS_IO_Handler // = TITLE - // + // // This class is used to implement the HTTP protocol // // = DESCRIPTION - // - // The HTTP_Handler class is a state based implementation of the - // HTTP protocol. Therefore, it can be used synchronously and - // asynchronously. It uses an abstract IO class to move between - // different HTTP protocol states. It is up to the IO class to - // decide on synchronous or asynchronous I/O. + // + // The HTTP_Handler class is a state based implementation of the + // HTTP protocol. Therefore, it can be used synchronously and + // asynchronously. It uses an abstract IO class to move between + // different HTTP protocol states. It is up to the IO class to + // decide on synchronous or asynchronous I/O. { // Friend I/O classes. Can call protected methods. friend class JAWS_Synch_IO; @@ -49,8 +54,8 @@ class HTTP_Handler : protected JAWS_IO_Handler friend class Synch_HTTP_Handler_Factory; public: - virtual void open (ACE_HANDLE handle, - ACE_Message_Block &initial_data); + virtual void open (ACE_HANDLE handle, + ACE_Message_Block &initial_data); // The handler is initialized with a connection <handle> of a new // client and any <initial_data> that came across. The // <initial_data> block will be of MAX_REQUEST_SIZE and the number @@ -59,7 +64,7 @@ public: protected: HTTP_Handler (JAWS_IO &io, - HTTP_Handler_Factory &factory); + HTTP_Handler_Factory &factory); // The constructor is passed the factory that created <this> and the // IO mechanism that the handler should use. @@ -73,7 +78,7 @@ protected: // This is the termination state of the handler. After successful or // unsuccessful completions, the handler will end up in this state // (method). - + virtual void request_too_long (void); // Request too long. @@ -94,11 +99,11 @@ protected: virtual void error_message_complete (void); public: - enum + enum { MAX_SOCKBUFSIZE = 64 * 1024, MAX_REQUEST_SIZE = 8192, - METHODSIZ = 10, + METHODSIZ = 10, VERSIONSIZ = 10 }; @@ -118,11 +123,11 @@ private: class HTTP_Handler_Factory // = TITLE - // + // // This class is used to create new HTTP handlers // // = DESCRIPTION - // + // // This is an abstract factory for creating new HTTP handlers. { public: @@ -133,7 +138,7 @@ public: // This creates a new HTTP_Handler virtual void destroy_http_handler (HTTP_Handler &handler, - JAWS_IO &io) = 0; + JAWS_IO &io) = 0; // The HTTP handler will call this method from HTTP_Handler::done to // tell the factory to reap up the handler as it is now done with // the protocol @@ -141,7 +146,7 @@ public: class Synch_HTTP_Handler_Factory : public HTTP_Handler_Factory // = TITLE - // + // // This class is used to create new HTTP handlers that will use // Synch IO // @@ -152,7 +157,7 @@ public: // This creates a new HTTP_Handler void destroy_http_handler (HTTP_Handler &handler, - JAWS_IO &io); + JAWS_IO &io); // The HTTP handler will call this method from HTTP_Handler::done to // tell the factory to reap up the handler as it is now done with // the protocol @@ -168,7 +173,7 @@ class Asynch_HTTP_Handler_Factory : public HTTP_Handler_Factory, public ACE_Serv { public: void destroy_http_handler (HTTP_Handler &handler, - JAWS_IO &io); + JAWS_IO &io); // The HTTP handler will call this method from HTTP_Handler::done to // tell the factory to reap up the handler as it is now done with // the protocol diff --git a/apps/JAWS/server/HTTP_Helpers.h b/apps/JAWS/server/HTTP_Helpers.h index b22533d62b0..68f05729e48 100644 --- a/apps/JAWS/server/HTTP_Helpers.h +++ b/apps/JAWS/server/HTTP_Helpers.h @@ -6,20 +6,24 @@ // // = LIBRARY // apps -// +// // = FILENAME // HTTP_Helpers.h // // = AUTHOR // James Hu -// +// // ============================================================================ -#if !defined (HTTP_HELPERS_H) +#ifndef HTTP_HELPERS_H #define HTTP_HELPERS_H #include "ace/Synch.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class HTTP_Helper // Static functions to enhance the lives of HTTP programmers everywhere. { @@ -68,7 +72,7 @@ public: static const char **instance (void); // Singleton access point. - enum STATUS_CODE + enum STATUS_CODE { STATUS_OK = 200, STATUS_CREATED = 201, @@ -88,7 +92,7 @@ public: STATUS_INSUFFICIENT_DATA = 399 }; - enum + enum { MAX_STATUS_CODE = 599 }; diff --git a/apps/JAWS/server/HTTP_Request.h b/apps/JAWS/server/HTTP_Request.h index 907926e70a4..48dac56366c 100644 --- a/apps/JAWS/server/HTTP_Request.h +++ b/apps/JAWS/server/HTTP_Request.h @@ -6,27 +6,32 @@ // // = LIBRARY // jaws -// +// // = FILENAME // HTTP_Request.h // // = AUTHOR // James Hu -// +// // ============================================================================ -#if !defined (HTTP_REQUEST_H) +#ifndef HTTP_REQUEST_H #define HTTP_REQUEST_H class ACE_Message_Block; #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Parse_Headers.h" -class HTTP_Request +class HTTP_Request // = TITLE // This parses the client request of an HTTP transaction. - // + // // = DESCRIPTION { public: @@ -44,7 +49,7 @@ public: // form: METHOD URI VERSION. int init (char *const buffer, - int buflen); + int buflen); // Initialize the request object. This will parse the buffer and // prepare for the accessors. diff --git a/apps/JAWS/server/HTTP_Response.h b/apps/JAWS/server/HTTP_Response.h index 0ddbf7268d1..3b9a63b6433 100644 --- a/apps/JAWS/server/HTTP_Response.h +++ b/apps/JAWS/server/HTTP_Response.h @@ -6,16 +6,16 @@ // // = LIBRARY // jaws -// +// // = FILENAME // HTTP_Response.h // // = AUTHOR // James Hu -// +// // ============================================================================ -#if !defined (HTTP_RESPONSE_H) +#ifndef HTTP_RESPONSE_H #define HTTP_RESPONSE_H class JAWS_IO; @@ -33,7 +33,7 @@ class HTTP_Response { public: HTTP_Response (JAWS_IO &io, - HTTP_Request &request); + HTTP_Request &request); HTTP_Response (HTTP_Request &request, JAWS_IO &io); ~HTTP_Response (void); @@ -41,7 +41,7 @@ public: // This is called by the handler to initiate a response. void error_response (int status, - const char *log_message); + const char *log_message); // This returns an error response for cases where there is a problem // with the request, logging the log_message. diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h index d682ffbc88f..614f98b3e24 100644 --- a/apps/JAWS/server/HTTP_Server.h +++ b/apps/JAWS/server/HTTP_Server.h @@ -5,19 +5,24 @@ // // = LIBRARY // jaws -// +// // = FILENAME // HTTP_Server.h // // = AUTHOR // James Hu -// +// // ============================================================================ -#if !defined (HTTP_SERVER_H) +#ifndef HTTP_SERVER_H #define HTTP_SERVER_H #include "ace/Service_Object.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Thread_Manager.h" #include "ace/Acceptor.h" #include "ace/LOCK_SOCK_Acceptor.h" @@ -40,7 +45,7 @@ class HTTP_Server : public ACE_Service_Object // = TITLE // This server is used to create HTTP Handlers for the Web // server - // + // // = DESCRIPTION { public: @@ -56,10 +61,10 @@ protected: virtual int asynch_thread_pool (void); // Asynch Thread Pool implementation - + virtual int synch_thread_pool (void); // Synch Thread Pool implementation - + private: // James, comment these data members. void parse_args (int argc, char **argv); @@ -75,7 +80,7 @@ private: class Synch_Thread_Pool_Task : public ACE_Task<ACE_NULL_SYNCH> // = TITLE // Used to implement Synch Thread Pool - // + // // = DESCRIPTION // Describe this and the others below. { @@ -92,7 +97,7 @@ private: class Thread_Per_Request_Task : public ACE_Task<ACE_NULL_SYNCH> // = TITLE // Used to implement Thread Per Request. - // + // // = DESCRIPTION // Spawns a new thread for every new incoming connection. The // handle below is the socket stream of the incoming connection. @@ -115,7 +120,7 @@ private: class Asynch_Thread_Pool_Task : public ACE_Task<ACE_NULL_SYNCH> // = TITLE // Used to implement Asynch Thread Pool - // + // // = DESCRIPTION // The proactor below utilizes WaitForMultipleObjects. { diff --git a/apps/JAWS/server/IO.h b/apps/JAWS/server/IO.h index 5f14a1ed965..cf22d1ff09f 100644 --- a/apps/JAWS/server/IO.h +++ b/apps/JAWS/server/IO.h @@ -6,32 +6,37 @@ // // = LIBRARY // jaws -// +// // = FILENAME // IO.h // // = AUTHOR // James Hu -// +// // ============================================================================ -#if !defined (JAWS_IO_H) +#ifndef JAWS_IO_H #define JAWS_IO_H class ACE_Message_Block; class JAWS_IO_Handler; #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Asynch_IO.h" class JAWS_IO // = TITLE - // + // // This class defines the abstract interface for an I/O class in // the context of Web-likes servers // // = DESCRIPTION - // + // // An I/O class should have the following interface. Derived // classes will define the exactly how the I/O will take place // (Asynchronous, Synchronous, Reactive) @@ -49,24 +54,24 @@ public: // read from the handle size bytes into the message block. virtual void transmit_file (const char *filename, - const char *header, - int header_size, - const char *trailer, - int trailer_size) = 0; + const char *header, + int header_size, + const char *trailer, + int trailer_size) = 0; // send header, filename, trailer to the handle. virtual void receive_file (const char *filename, - void *initial_data, - int initial_data_length, - int entire_length) = 0; + void *initial_data, + int initial_data_length, + int entire_length) = 0; // read data from the handle and store in filename. - virtual void send_confirmation_message (const char *buffer, int length) = 0; + virtual void send_confirmation_message (const char *buffer, int length) = 0; // send a confirmation message to the handle. - virtual void send_error_message (const char *buffer, int length) = 0; + virtual void send_error_message (const char *buffer, int length) = 0; // send an error message to the handle. - + protected: ACE_HANDLE handle_; JAWS_IO_Handler *handler_; @@ -74,7 +79,7 @@ protected: class JAWS_IO_Handler // = TITLE - // + // // This class defines the abstract interface for an I/O handler class in // the context of Web-likes servers // @@ -121,7 +126,7 @@ public: class JAWS_Synch_IO : public JAWS_IO // = TITLE - // + // // This class defines the interface for a Synchronous I/O class. // // = DESCRIPTION @@ -131,28 +136,28 @@ public: ~JAWS_Synch_IO (void); - void read (ACE_Message_Block& mb, int size); + void read (ACE_Message_Block& mb, int size); void transmit_file (const char *filename, - const char *header, - int header_size, - const char *trailer, - int trailer_size); + const char *header, + int header_size, + const char *trailer, + int trailer_size); void receive_file (const char *filename, - void *initial_data, - int initial_data_length, - int entire_length); + void *initial_data, + int initial_data_length, + int entire_length); - void send_confirmation_message (const char *buffer, - int length); + void send_confirmation_message (const char *buffer, + int length); void send_error_message (const char *buffer, - int length); - + int length); + protected: virtual void send_message (const char *buffer, - int length); + int length); }; // This only works on Win32 @@ -160,7 +165,7 @@ protected: class JAWS_Asynch_IO : public JAWS_IO, public ACE_Handler // = TITLE - // + // // This class defines the interface for a Asynchronous I/O class. // // = DESCRIPTION @@ -173,21 +178,21 @@ public: void read (ACE_Message_Block& mb, int size); void transmit_file (const char *filename, - const char *header, - int header_size, - const char *trailer, - int trailer_size); + const char *header, + int header_size, + const char *trailer, + int trailer_size); void receive_file (const char *filename, - void *initial_data, - int initial_data_length, - int entire_length); + void *initial_data, + int initial_data_length, + int entire_length); void send_confirmation_message (const char *buffer, - int length); + int length); void send_error_message (const char *buffer, - int length); + int length); protected: enum Message_Types @@ -197,8 +202,8 @@ protected: }; virtual void send_message (const char *buffer, - int length, - int act); + int length, + int act); virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result); // This method will be called when an asynchronous read completes on diff --git a/apps/JAWS/server/JAWS_Concurrency.h b/apps/JAWS/server/JAWS_Concurrency.h index b6f9efe6fbb..39b4700df72 100644 --- a/apps/JAWS/server/JAWS_Concurrency.h +++ b/apps/JAWS/server/JAWS_Concurrency.h @@ -1,10 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_CONCURRENCY_H) +#ifndef JAWS_CONCURRENCY_H #define JAWS_CONCURRENCY_H #include "ace/Synch.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Task.h" #include "IO.h" diff --git a/apps/JAWS/server/JAWS_Pipeline.h b/apps/JAWS/server/JAWS_Pipeline.h index 7867213076f..bac2acc6f91 100644 --- a/apps/JAWS/server/JAWS_Pipeline.h +++ b/apps/JAWS/server/JAWS_Pipeline.h @@ -1,10 +1,15 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_PIPELINE_H) +#ifndef JAWS_PIPELINE_H #define JAWS_PIPELINE_H #include "ace/Synch.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Service_Config.h" #include "ace/Stream.h" #include "ace/Module.h" diff --git a/apps/JAWS/server/JAWS_Pipeline_Handler.h b/apps/JAWS/server/JAWS_Pipeline_Handler.h index 784b44f8b7c..7e9becb6f5e 100644 --- a/apps/JAWS/server/JAWS_Pipeline_Handler.h +++ b/apps/JAWS/server/JAWS_Pipeline_Handler.h @@ -1,7 +1,7 @@ /* -*- c++ -*- */ // $Id$ -#if !defined (JAWS_PIPELINE_HANDLER_H) +#ifndef JAWS_PIPELINE_HANDLER_H #define JAWS_PIPELINE_HANDLER_H #include "JAWS_Pipeline.h" diff --git a/apps/JAWS/server/Parse_Headers.h b/apps/JAWS/server/Parse_Headers.h index 126243d4582..68274bd442b 100644 --- a/apps/JAWS/server/Parse_Headers.h +++ b/apps/JAWS/server/Parse_Headers.h @@ -15,11 +15,15 @@ // // ============================================================================ -#if !defined (PARSE_HEADERS_H) +#ifndef PARSE_HEADERS_H #define PARSE_HEADERS_H #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + class Headers_Map_Item { friend class Headers_Map; diff --git a/apps/JAWS/stress_testing/global.h b/apps/JAWS/stress_testing/global.h index 8cb45fb3dd1..58a0b24b3e0 100644 --- a/apps/JAWS/stress_testing/global.h +++ b/apps/JAWS/stress_testing/global.h @@ -1,6 +1,11 @@ // $Id$ #include "ace/ACE.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/OS.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" diff --git a/apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h b/apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h index 351fa0641ad..e8a193e8385 100644 --- a/apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h +++ b/apps/Orbix-Examples/Event_Comm/Consumer/Input_Handler.h @@ -5,20 +5,24 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Input_Handler.h // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_INPUT_HANDLER_H) +#ifndef _INPUT_HANDLER_H #define _INPUT_HANDLER_ #include "ace/Service_Config.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0) // Forward declaration. class Notification_Receiver_Handler; @@ -34,12 +38,12 @@ class Input_Handler : public ACE_Service_Object public: Input_Handler (Notification_Receiver_Handler *, ACE_HANDLE h = 0); - + virtual int handle_input (ACE_HANDLE); // Dispatch the callback when events occur. - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK); + virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, + ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK); // Close down the handler. int consumer_initiated_shutdown (void); @@ -55,7 +59,7 @@ private: virtual ACE_HANDLE get_handle (void) const; ACE_HANDLE handle_; - // ACE_HANDLE where the input comes from. + // ACE_HANDLE where the input comes from. Notification_Receiver_Handler *receiver_handler_; // Pointer to the <Notification_Receiver_Handler> that receives diff --git a/apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h b/apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h index e51d0a359e6..e5595339158 100644 --- a/apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h +++ b/apps/Orbix-Examples/Event_Comm/Consumer/Notification_Receiver_Handler.h @@ -5,28 +5,33 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Notifier_Receiver_Handler.h // -// = DESCRIPTION +// = DESCRIPTION // Subclass of Corba_Handler that sets up the Notification_Receiver handler // for use with the ACE ACE_Reactor. // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_NOTIFICATION_RECEIVER_HANDLER_H) +#ifndef _NOTIFICATION_RECEIVER_HANDLER_H #define _NOTIFICATION_RECEIVER_HANDLER_H #include "ace/CORBA_Handler.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Event_Comm_i.h" #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0) -class Notification_Receiver_Handler +class Notification_Receiver_Handler { // = TITLE // Subclass of Corba_Handler that sets up the Notification @@ -42,8 +47,8 @@ public: Event_Comm::Notification_Receiver *receiver (void); Event_Comm::Notifier *notifier (void); - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK); + virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, + ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK); // Close down the handler. private: diff --git a/apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h b/apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h index 4a5ab5c2389..813a8b7af36 100644 --- a/apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h +++ b/apps/Orbix-Examples/Event_Comm/Supplier/Input_Handler.h @@ -5,23 +5,27 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Input_Handler.h // -// = DESCRIPTION +// = DESCRIPTION // Handle input from the keyboard. // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_INPUT_HANDLER_H) +#ifndef _INPUT_HANDLER_H #define _INPUT_HANDLER_H #include "ace/Service_Config.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0) // Forward declaration. @@ -33,7 +37,7 @@ class Input_Handler : public ACE_Service_Object // Handles input events generated from a keyboard. // // = DESCRIPTION - // The events are currently framed and forwarded to + // The events are currently framed and forwarded to // all Consumers. In the future, we will need to // be more selective and only send to those Consumers // whose filtering criteria matches! @@ -46,14 +50,14 @@ public: // Frame input events and notify <Consumers>. virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK); + ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK); // Close down the handler. protected: virtual ACE_HANDLE get_handle (void) const; ACE_HANDLE handle_; - // ACE_HANDLE where the input comes from. + // ACE_HANDLE where the input comes from. Notifier_Handler *notifier_; // Pointer to a <Notifier_Handler> that's used to inform Consumers diff --git a/apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h b/apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h index 7d9c4609634..3c9df6b6aaf 100644 --- a/apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h +++ b/apps/Orbix-Examples/Event_Comm/Supplier/Notifier_Handler.h @@ -5,19 +5,24 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Notifier_Handler.h // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_NOTIFIER_HANDLER_H) +#ifndef _NOTIFIER_HANDLER_H #define _NOTIFIER_HANDLER_H #include "ace/CORBA_Handler.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Event_Comm_i.h" #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0) @@ -28,14 +33,14 @@ class Notifier_Handler { public: Notifier_Handler (const char *service_location, - const char *marker = "notifier", - int putit = 1); // Default marker name. + const char *marker = "notifier", + int putit = 1); // Default marker name. Event_Comm::Notifier *notifier (void); void notifier (Event_Comm::Notifier *); - virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, - ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK); + virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE, + ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK); // Close down the handler. private: diff --git a/apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h b/apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h index f8d3a12bb7f..3775d071683 100644 --- a/apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h +++ b/apps/Orbix-Examples/Event_Comm/include/Event_Comm_i.h @@ -6,20 +6,20 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Event_Comm_i.h // -// = DESCRIPTION +// = DESCRIPTION // Class interface for the implementation of the distributed // event notification mechanism. // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_EVENT_COMM_I_H) +#ifndef _EVENT_COMM_I_H #define _EVENT_COMM_I_H #include "Notification_Receiver_i.h" diff --git a/apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h b/apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h index eb5efa718dd..dbcd6671d8f 100644 --- a/apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h +++ b/apps/Orbix-Examples/Event_Comm/include/Notification_Receiver_i.h @@ -6,19 +6,19 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Notification_Receiver__i.h // -// = DESCRIPTION +// = DESCRIPTION // Class interface for the implementation of the <Notification_Receiver> // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_Notification_Receiver_i_H) +#ifndef _Notification_Receiver_i_H #define _Notification_Receiver_i_H #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0) @@ -35,11 +35,11 @@ public: ~Notification_Receiver_i (void); virtual void receive_notification (const Event_Comm::Notification ¬ification, - CORBA::Environment &IT_env); + CORBA::Environment &IT_env); // Pass the <Notification> to the <Notification_Receiver>. virtual void disconnect (const char *reason, - CORBA::Environment &IT_env); + CORBA::Environment &IT_env); // Disconnect the <Notification_Receiver> from the <Notifier>, // giving it the <reason>. }; diff --git a/apps/Orbix-Examples/Event_Comm/include/Notifier_i.h b/apps/Orbix-Examples/Event_Comm/include/Notifier_i.h index 5e7ac590f37..61249d68386 100644 --- a/apps/Orbix-Examples/Event_Comm/include/Notifier_i.h +++ b/apps/Orbix-Examples/Event_Comm/include/Notifier_i.h @@ -6,22 +6,27 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Notifier_i.h // -// = DESCRIPTION +// = DESCRIPTION // Class interface for the implementation of the <Notifier> // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_Notifier_i_H) +#ifndef _Notifier_i_H #define _Notifier_i_H #include "ace/Map_Manager.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" #include "ace/SString.h" #include "Event_Comm.hh" @@ -38,7 +43,7 @@ class Notifier_i // = DESCRIPTION { public: - enum + enum { DEFAULT_SIZE = 1024 // Default max number of Event_Comm::Notification_Receivers. }; @@ -47,27 +52,27 @@ public: // Initialize a Notifier_i object with the specified size hint. void send_disconnect (const char *reason, - CORBA::Environment &IT_env); + CORBA::Environment &IT_env); // Disconnect all the receivers, giving them the <reason>. void send_notification (const Event_Comm::Notification ¬ification, - CORBA::Environment &IT_env); + CORBA::Environment &IT_env); // Send the <Notification> to all the consumers who // have subscribed and who match the filtering criteria. void subscribe (Event_Comm::Notification_Receiver *notification_receiver, - const char *filtering_criteria, - CORBA::Environment &IT_env); - // Subscribe the <Notification_Receiver> to receive events that + const char *filtering_criteria, + CORBA::Environment &IT_env); + // Subscribe the <Notification_Receiver> to receive events that // match <filtering_criteria> applied by the <Notifier>. void unsubscribe (Event_Comm::Notification_Receiver *notification_receiver, - const char *filtering_criteria, - CORBA::Environment &IT_env); + const char *filtering_criteria, + CORBA::Environment &IT_env); // Unsubscribe the <Notification_Receiver>. private: - // The following implementation should be replaced + // The following implementation should be replaced // by a standard container class from STL... typedef ACE_Map_Manager <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex> MAP_MANAGER; diff --git a/apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h b/apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h index edab38fc612..8142ac91632 100644 --- a/apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h +++ b/apps/Orbix-Examples/Event_Comm/libsrc/Event_Comm_i.h @@ -5,20 +5,20 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Event_Comm_i.h // -// = DESCRIPTION +// = DESCRIPTION // Class interface for the implementation of the distributed // event notification mechanism. // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_EVENT_COMM_I_H) +#ifndef _EVENT_COMM_I_H #define _EVENT_COMM_I_H #include "Notification_Receiver_i.h" diff --git a/apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h b/apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h index ac86f5852b7..4466db11c21 100644 --- a/apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h +++ b/apps/Orbix-Examples/Event_Comm/libsrc/Notification_Receiver_i.h @@ -5,19 +5,19 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Notification_Receiver__i.h // -// = DESCRIPTION +// = DESCRIPTION // Class interface for the implementation of the <Notification_Receiver> // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_Notification_Receiver_i_H) +#ifndef _Notification_Receiver_i_H #define _Notification_Receiver_i_H #if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0) @@ -36,11 +36,11 @@ public: // Destructor. virtual void receive_notification (const Event_Comm::Notification ¬ification, - CORBA::Environment &IT_env); + CORBA::Environment &IT_env); // Pass the <Notification> to the <Notification_Receiver>. virtual void disconnect (const char *reason, - CORBA::Environment &IT_env); + CORBA::Environment &IT_env); // Disconnect the <Notification_Receiver> from the <Notifier>, // giving it the <reason>. }; diff --git a/apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h b/apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h index 42183395bea..dd1d17ef16c 100644 --- a/apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h +++ b/apps/Orbix-Examples/Event_Comm/libsrc/Notifier_i.h @@ -6,22 +6,27 @@ // // = LIBRARY // EventComm -// +// // = FILENAME // Notifier_i.h // -// = DESCRIPTION +// = DESCRIPTION // Class interface for the implementation of the <Notifier> // // = AUTHOR // Douglas C. Schmidt (schmidt@cs.wustl.edu) -// +// // ============================================================================ -#if !defined (_Notifier_i_H) +#ifndef _Notifier_i_H #define _Notifier_i_H #include "ace/Map_Manager.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Synch.h" #include "ace/SString.h" #include "Event_Comm.hh" @@ -36,7 +41,7 @@ class Notifier_i // = TITLE // Defines the implementation class for event <Notifiers>. public: - enum + enum { DEFAULT_SIZE = 1024 // Default max number of Event_Comm::Notification_Receivers. }; @@ -45,34 +50,34 @@ public: // Initialize a Notifier_i object with the specified size hint. void send_disconnect (const char *reason, - CORBA::Environment &IT_env); + CORBA::Environment &IT_env); // Disconnect all the receivers, giving them the <reason>. void send_notification (const Event_Comm::Notification ¬ification, - CORBA::Environment &IT_env); + CORBA::Environment &IT_env); // Send the <Notification> to all the consumers who have subscribed // and who match the filtering criteria. void subscribe (Event_Comm::Notification_Receiver *notification_receiver, - const char *filtering_criteria, - CORBA::Environment &IT_env); + const char *filtering_criteria, + CORBA::Environment &IT_env); // Subscribe the <Notification_Receiver> to receive events that // match <filtering_criteria> applied by the <Notifier>. void unsubscribe (Event_Comm::Notification_Receiver *notification_receiver, - const char *filtering_criteria, - CORBA::Environment &IT_env); + const char *filtering_criteria, + CORBA::Environment &IT_env); // Unsubscribe the <Notification_Receiver>. private: - // The following implementation should be replaced + // The following implementation should be replaced // by a standard container class from STL... - typedef ACE_Map_Manager <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex> + typedef ACE_Map_Manager <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex> MAP_MANAGER; - typedef ACE_Map_Iterator <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex> + typedef ACE_Map_Iterator <ACE_SString, Notification_Receiver_Entry *, ACE_Null_Mutex> MAP_ITERATOR; - typedef ACE_Map_Entry <ACE_SString, Notification_Receiver_Entry *> + typedef ACE_Map_Entry <ACE_SString, Notification_Receiver_Entry *> MAP_ENTRY; MAP_MANAGER map_; diff --git a/apps/Orbix-Examples/Logger/Logger.h b/apps/Orbix-Examples/Logger/Logger.h index 5832c96aab6..a233204f362 100644 --- a/apps/Orbix-Examples/Logger/Logger.h +++ b/apps/Orbix-Examples/Logger/Logger.h @@ -2,15 +2,20 @@ // $Id$ -#if !defined (_LOGGER_H) +#ifndef _LOGGER_H #define _LOGGER_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "logger.hh" class Logger // = TITLE - // Wrapper class that uses CORBA object reference + // Wrapper class that uses CORBA object reference // as the transport mechanism to simplify implementation. { public: @@ -35,7 +40,7 @@ public: int stop_timer (profile_logger::Elapsed_Time &et); // Deactivate the timer and return the elapsed time. - + private: profile_logger *logref_; // CORBA object reference proxy. diff --git a/apps/Orbix-Examples/Logger/logger_i.h b/apps/Orbix-Examples/Logger/logger_i.h index 40d7b77c6bf..407af302aba 100644 --- a/apps/Orbix-Examples/Logger/logger_i.h +++ b/apps/Orbix-Examples/Logger/logger_i.h @@ -3,10 +3,15 @@ #include "ace/Profile_Timer.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #define EXCEPTIONS #include "logger.hh" -class logger_i +class logger_i #if defined (USE_BOA_IMPL) : virtual public loggerBOAImpl #endif /* USE_BOA_IMPL */ @@ -44,7 +49,7 @@ class profile_logger_i : public virtual profile_loggerBOAImpl, public virtual Logger_i #else /* USE_TIE */ - public logger_i + public logger_i #endif /* USE_BOA_IMPL */ // = TITLE // Implementation of the profiler logger interface. @@ -57,7 +62,7 @@ public: // Activate the timer. virtual void stop_timer (profile_logger::Elapsed_Time &et, - CORBA::Environment &env); + CORBA::Environment &env); // Deactivate the timer and return the elapsed time. private: @@ -65,7 +70,7 @@ private: // Object that keeps track of the user and system execution time. }; -#if !defined (USE_BOA_IMPL) +#ifndef USE_BOA_IMPL // Indicate that the C++ classes logger_i and profile_logger_i implement // the IDL interface logger and profile_logger, respectively: diff --git a/apps/drwho/BS_Client.h b/apps/drwho/BS_Client.h index b6e62ebb339..9859768df82 100644 --- a/apps/drwho/BS_Client.h +++ b/apps/drwho/BS_Client.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_BS_CLIENT_H) +#ifndef _BS_CLIENT_H #define _BS_CLIENT_H #include "Binary_Search.h" @@ -22,7 +22,7 @@ class BS_Client : public Binary_Search { // = TITLE - // Provides the client's binary search lookup table abstraction. + // Provides the client's binary search lookup table abstraction. public: // = Initialization. BS_Client (void); diff --git a/apps/drwho/BS_Server.h b/apps/drwho/BS_Server.h index 03ff73d0aac..3c7c1a82afc 100644 --- a/apps/drwho/BS_Server.h +++ b/apps/drwho/BS_Server.h @@ -10,14 +10,14 @@ // BS_Server.h // // = DESCRIPTION -// Provides the server's binary search lookup table abstraction. +// Provides the server's binary search lookup table abstraction. // // = AUTHOR // Douglas C. Schmidt // // ============================================================================ -#if !defined (_BS_SERVER_H) +#ifndef _BS_SERVER_H #define _BS_SERVER_H #include "Binary_Search.h" @@ -25,7 +25,7 @@ class BS_Server : public Binary_Search { // = TITLE - // Provides the server's binary search lookup table abstraction. + // Provides the server's binary search lookup table abstraction. public: // = Initialization. BS_Server (const char *packet); diff --git a/apps/drwho/Binary_Search.h b/apps/drwho/Binary_Search.h index 2cdbcbc511c..ae8dc93cb29 100644 --- a/apps/drwho/Binary_Search.h +++ b/apps/drwho/Binary_Search.h @@ -17,7 +17,7 @@ // // ============================================================================ -#if !defined (_BINARY_SEARCH_H) +#ifndef _BINARY_SEARCH_H #define _BINARY_SEARCH_H #include "Search_Struct.h" diff --git a/apps/drwho/CM_Client.h b/apps/drwho/CM_Client.h index 09bc7e40d8f..1e789633a5a 100644 --- a/apps/drwho/CM_Client.h +++ b/apps/drwho/CM_Client.h @@ -11,14 +11,14 @@ // // = DESCRIPTION // Provides a virtual communcations layer for the client in the -// drwho program. +// drwho program. // // = AUTHOR // Douglas C. Schmidt // // ============================================================================ -#if !defined (_CM_CLIENT_H) +#ifndef _CM_CLIENT_H #define _CM_CLIENT_H #include "Comm_Manager.h" diff --git a/apps/drwho/CM_Server.h b/apps/drwho/CM_Server.h index 0e944db3064..a91402a5e48 100644 --- a/apps/drwho/CM_Server.h +++ b/apps/drwho/CM_Server.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_CM_SERVER_H) +#ifndef _CM_SERVER_H #define _CM_SERVER_H #include "Options.h" diff --git a/apps/drwho/Comm_Manager.h b/apps/drwho/Comm_Manager.h index 0dfd6b7c72e..ec3caf93e74 100644 --- a/apps/drwho/Comm_Manager.h +++ b/apps/drwho/Comm_Manager.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_COMM_MANAGER_H) +#ifndef _COMM_MANAGER_H #define _COMM_MANAGER_H #include "global.h" diff --git a/apps/drwho/Drwho_Node.h b/apps/drwho/Drwho_Node.h index c3c1418bbc8..02251b669df 100644 --- a/apps/drwho/Drwho_Node.h +++ b/apps/drwho/Drwho_Node.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_DRWHO_NODE_H) +#ifndef _DRWHO_NODE_H #define _DRWHO_NODE_H #include "global.h" @@ -48,5 +48,5 @@ public: int inactive_count_; Drwho_Node *next_; }; - + #endif /* _DRWHO_NODE_H */ diff --git a/apps/drwho/File_Manager.h b/apps/drwho/File_Manager.h index 374ba10b992..55482b2823d 100644 --- a/apps/drwho/File_Manager.h +++ b/apps/drwho/File_Manager.h @@ -14,11 +14,16 @@ // // ============================================================================ -#if !defined (_FILE_MANAGER_H) +#ifndef _FILE_MANAGER_H #define _FILE_MANAGER_H #include "global.h" #include "ace/Singleton.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "ace/Mem_Map.h" class File_Manager diff --git a/apps/drwho/HT_Client.h b/apps/drwho/HT_Client.h index 16828077d00..274cc6e72e6 100644 --- a/apps/drwho/HT_Client.h +++ b/apps/drwho/HT_Client.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_HT_CLIENT_H) +#ifndef _HT_CLIENT_H #define _HT_CLIENT_H #include "Hash_Table.h" @@ -22,7 +22,7 @@ class HT_Client : public Hash_Table { // = TITLE - // Provides the client's hash table abstraction. + // Provides the client's hash table abstraction. public: virtual Protocol_Record *insert (const char *key_name, int max_len = MAXUSERIDNAMELEN); diff --git a/apps/drwho/HT_Server.h b/apps/drwho/HT_Server.h index 96b110b14b0..3dbff633cfb 100644 --- a/apps/drwho/HT_Server.h +++ b/apps/drwho/HT_Server.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_HT_SERVER_H) +#ifndef _HT_SERVER_H #define _HT_SERVER_H #include "Hash_Table.h" diff --git a/apps/drwho/Hash_Table.h b/apps/drwho/Hash_Table.h index 327c55b74dd..44f5ea769fc 100644 --- a/apps/drwho/Hash_Table.h +++ b/apps/drwho/Hash_Table.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_HASH_TABLE_H) +#ifndef _HASH_TABLE_H #define _HASH_TABLE_H #include "Search_Struct.h" @@ -32,7 +32,7 @@ public: virtual Protocol_Record *get_each_entry (void); protected: - enum + enum { HASH_TABLE_SIZE = 500 }; diff --git a/apps/drwho/Multicast_Manager.h b/apps/drwho/Multicast_Manager.h index 33e815fe8b6..5b5f42eddbc 100644 --- a/apps/drwho/Multicast_Manager.h +++ b/apps/drwho/Multicast_Manager.h @@ -14,12 +14,12 @@ // // ============================================================================ -#if !defined (_MULTICAST_MANAGER_H) +#ifndef _MULTICAST_MANAGER_H #define _MULTICAST_MANAGER_H #include "global.h" -class Host_Elem +class Host_Elem { public: const char *host_name; @@ -30,7 +30,7 @@ public: Host_Elem (const char *h_name, Host_Elem *n); }; -class Multicast_Manager +class Multicast_Manager { // = TITLE // This file handles all the operations upon host machines names diff --git a/apps/drwho/Options.h b/apps/drwho/Options.h index d009c358e7e..13cf06777d2 100644 --- a/apps/drwho/Options.h +++ b/apps/drwho/Options.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_OPTIONS_H) +#ifndef _OPTIONS_H #define _OPTIONS_H #include "global.h" @@ -38,16 +38,16 @@ public: // Different types of messages. enum Protocol_Types - { - PROTO_USR = 1, // Only return info on one user. - PROTO_ALL = 2, // Return info on all users logged in around the system. - PROTO_FLO = 3, // Return info on friends logged in. - PROTO_RUSER = 4, // Return info in ruser format! - PROTO_RWHO = 5, // Return info in rwho format. - PROTO_WHO = 6, // Return info in who format. - PROTO_RUPTIME = 7 // Return info in ruptime format. + { + PROTO_USR = 1, // Only return info on one user. + PROTO_ALL = 2, // Return info on all users logged in around the system. + PROTO_FLO = 3, // Return info on friends logged in. + PROTO_RUSER = 4, // Return info in ruser format! + PROTO_RWHO = 5, // Return info in rwho format. + PROTO_WHO = 6, // Return info in who format. + PROTO_RUPTIME = 7 // Return info in ruptime format. }; - + static void set_options (int argc, char *argv[]); static void set_opt (Option_Types opt); static int get_opt (Option_Types opt); diff --git a/apps/drwho/PMC_All.h b/apps/drwho/PMC_All.h index 6f7578b492a..308388adf4f 100644 --- a/apps/drwho/PMC_All.h +++ b/apps/drwho/PMC_All.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PMC_ALL_H) +#ifndef _PMC_ALL_H #define _PMC_ALL_H #include "PM_Client.h" @@ -22,7 +22,7 @@ class PMC_All : public PM_Client { // = TITLE - // Provides the client's lookup table abstraction for `all' users... + // Provides the client's lookup table abstraction for `all' users... protected: virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record); diff --git a/apps/drwho/PMC_Flo.h b/apps/drwho/PMC_Flo.h index 88f534023be..305a8d8803c 100644 --- a/apps/drwho/PMC_Flo.h +++ b/apps/drwho/PMC_Flo.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PMC_FLO_H) +#ifndef _PMC_FLO_H #define _PMC_FLO_H #include "PM_Client.h" @@ -22,7 +22,7 @@ class PMC_Flo : public PM_Client { // = TITLE - // Provides the client's lookup table abstraction for `flo' users... + // Provides the client's lookup table abstraction for `flo' users... public: PMC_Flo (void); diff --git a/apps/drwho/PMC_Ruser.h b/apps/drwho/PMC_Ruser.h index f121fc95be7..fe3d3c23363 100644 --- a/apps/drwho/PMC_Ruser.h +++ b/apps/drwho/PMC_Ruser.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PMC_RUSER_H) +#ifndef _PMC_RUSER_H #define _PMC_RUSER_H #include "PM_Client.h" @@ -22,7 +22,7 @@ class PMC_Ruser : public PM_Client { // = TITLE - // Provides the client's lookup table abstraction for `ruser' users... + // Provides the client's lookup table abstraction for `ruser' users... public: PMC_Ruser (void); diff --git a/apps/drwho/PMC_Usr.h b/apps/drwho/PMC_Usr.h index 09edd37fa28..f98c8325b83 100644 --- a/apps/drwho/PMC_Usr.h +++ b/apps/drwho/PMC_Usr.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PMC_USR_H) +#ifndef _PMC_USR_H #define _PMC_USR_H #include "PM_Client.h" diff --git a/apps/drwho/PMS_All.h b/apps/drwho/PMS_All.h index b4de614d5df..41459f57cbe 100644 --- a/apps/drwho/PMS_All.h +++ b/apps/drwho/PMS_All.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PMS_ALL_H) +#ifndef _PMS_ALL_H #define _PMS_ALL_H #include "PM_Server.h" diff --git a/apps/drwho/PMS_Flo.h b/apps/drwho/PMS_Flo.h index 5ef36641015..b7fefa5abec 100644 --- a/apps/drwho/PMS_Flo.h +++ b/apps/drwho/PMS_Flo.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PMS_FLO_H) +#ifndef _PMS_FLO_H #define _PMS_FLO_H #include "PM_Server.h" @@ -22,7 +22,7 @@ class PMS_Flo : public PM_Server { // = TITLE - // Provides the server's lookup table abstraction for `flo' users... + // Provides the server's lookup table abstraction for `flo' users... public: PMS_Flo (void); diff --git a/apps/drwho/PMS_Ruser.h b/apps/drwho/PMS_Ruser.h index cecca15b7b5..f26e916549f 100644 --- a/apps/drwho/PMS_Ruser.h +++ b/apps/drwho/PMS_Ruser.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PMS_RUSER_H) +#ifndef _PMS_RUSER_H #define _PMS_RUSER_H #include "PM_Server.h" @@ -22,7 +22,7 @@ class PMS_Ruser : public PM_Server { // = TITLE - // Provides the server's lookup table abstraction for `ruser' users... + // Provides the server's lookup table abstraction for `ruser' users... public: PMS_Ruser (void); diff --git a/apps/drwho/PMS_Usr.h b/apps/drwho/PMS_Usr.h index 2d1df1f3d46..1f29e43d653 100644 --- a/apps/drwho/PMS_Usr.h +++ b/apps/drwho/PMS_Usr.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PMS_USR_H) +#ifndef _PMS_USR_H #define _PMS_USR_H #include "PM_Server.h" @@ -22,7 +22,7 @@ class PMS_Usr : public PM_Server { // = TITLE - // Provides the client's lookup table abstraction for `Usr' users... + // Provides the client's lookup table abstraction for `Usr' users... public: PMS_Usr (void); diff --git a/apps/drwho/PM_Client.h b/apps/drwho/PM_Client.h index 6c7b3c90660..f44ab84f69f 100644 --- a/apps/drwho/PM_Client.h +++ b/apps/drwho/PM_Client.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PM_CLIENT_H) +#ifndef _PM_CLIENT_H #define _PM_CLIENT_H #include "Protocol_Manager.h" @@ -22,7 +22,7 @@ class PM_Client : public Protocol_Manager { // = TITLE - // Provides the client side of the friend manager lookup table abstraction. + // Provides the client side of the friend manager lookup table abstraction. public: PM_Client (void); virtual ~PM_Client (void); diff --git a/apps/drwho/PM_Server.h b/apps/drwho/PM_Server.h index 11dba1748ab..2a355c8e262 100644 --- a/apps/drwho/PM_Server.h +++ b/apps/drwho/PM_Server.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PM_SERVER_H) +#ifndef _PM_SERVER_H #define _PM_SERVER_H #include "Protocol_Manager.h" @@ -22,7 +22,7 @@ class PM_Server : public Protocol_Manager { // = TITLE - // Handle the server's lookup table abstraction. + // Handle the server's lookup table abstraction. public: PM_Server (void); diff --git a/apps/drwho/Protocol_Manager.h b/apps/drwho/Protocol_Manager.h index 63f95d9b342..d61e752c8df 100644 --- a/apps/drwho/Protocol_Manager.h +++ b/apps/drwho/Protocol_Manager.h @@ -14,10 +14,15 @@ // // ============================================================================ -#if !defined (_PROTOCOL_MANAGER_H) +#ifndef _PROTOCOL_MANAGER_H #define _PROTOCOL_MANAGER_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Options.h" #include "Search_Struct.h" #include "Protocol_Record.h" @@ -26,7 +31,7 @@ class Protocol_Manager { // = TITLE // A base class that consolidates friend management functionality - // shared by both clients and servers. + // shared by both clients and servers. public: Protocol_Manager (void); virtual ~Protocol_Manager (void); diff --git a/apps/drwho/Protocol_Record.h b/apps/drwho/Protocol_Record.h index 74d48b7494a..60cf250adf1 100644 --- a/apps/drwho/Protocol_Record.h +++ b/apps/drwho/Protocol_Record.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_PROTOCOL_RECORD_H) +#ifndef _PROTOCOL_RECORD_H #define _PROTOCOL_RECORD_H #include "Drwho_Node.h" @@ -22,7 +22,7 @@ class Protocol_Record { // = TITLE - // Stores information about a single friend's status. + // Stores information about a single friend's status. public: Protocol_Record (void); diff --git a/apps/drwho/Rwho_DB_Manager.h b/apps/drwho/Rwho_DB_Manager.h index bb8029fff9a..b995a172a7d 100644 --- a/apps/drwho/Rwho_DB_Manager.h +++ b/apps/drwho/Rwho_DB_Manager.h @@ -14,14 +14,19 @@ // // ============================================================================ -#if !defined (_RWHO_DB_MANAGER_H) +#ifndef _RWHO_DB_MANAGER_H #define _RWHO_DB_MANAGER_H #include <protocols/rwhod.h> #include "ace/Dirent.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Protocol_Record.h" -class RWho_DB_Manager +class RWho_DB_Manager { // = TITLE // This class returns the user/machine pairs one at a time from diff --git a/apps/drwho/SL_Client.h b/apps/drwho/SL_Client.h index 7af14197258..16be3842064 100644 --- a/apps/drwho/SL_Client.h +++ b/apps/drwho/SL_Client.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SL_CLIENT_H) +#ifndef _SL_CLIENT_H #define _SL_CLIENT_H #include "Single_Lookup.h" @@ -22,7 +22,7 @@ class SL_Client : public Single_Lookup { // = TITLE - // Provides the client's single user lookup table abstraction. + // Provides the client's single user lookup table abstraction. public: SL_Client (const char *key_name); diff --git a/apps/drwho/SL_Server.h b/apps/drwho/SL_Server.h index 7302371275a..2a8ee2ba054 100644 --- a/apps/drwho/SL_Server.h +++ b/apps/drwho/SL_Server.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SL_SERVER_H) +#ifndef _SL_SERVER_H #define _SL_SERVER_H #include "Single_Lookup.h" @@ -22,7 +22,7 @@ class SL_Server : public Single_Lookup { // = TITLE - // Provides the server's single user lookup table abstraction. + // Provides the server's single user lookup table abstraction. public: SL_Server (const char *packet); diff --git a/apps/drwho/SML_Client.h b/apps/drwho/SML_Client.h index 42dedf46248..d02fb8d6fa0 100644 --- a/apps/drwho/SML_Client.h +++ b/apps/drwho/SML_Client.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SML_CLIENT_H) +#ifndef _SML_CLIENT_H #define _SML_CLIENT_H #include "SM_Client.h" diff --git a/apps/drwho/SML_Server.h b/apps/drwho/SML_Server.h index cb1f1d0d80e..5fc665450df 100644 --- a/apps/drwho/SML_Server.h +++ b/apps/drwho/SML_Server.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SML_SERVER_H) +#ifndef _SML_SERVER_H #define _SML_SERVER_H #include "SM_Server.h" diff --git a/apps/drwho/SMR_Client.h b/apps/drwho/SMR_Client.h index dc3081f1210..9725c3ebd96 100644 --- a/apps/drwho/SMR_Client.h +++ b/apps/drwho/SMR_Client.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SMR_CLIENT_H) +#ifndef _SMR_CLIENT_H #define _SMR_CLIENT_H #include "SM_Client.h" diff --git a/apps/drwho/SMR_Server.h b/apps/drwho/SMR_Server.h index d471245aeae..af8b384d701 100644 --- a/apps/drwho/SMR_Server.h +++ b/apps/drwho/SMR_Server.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SMR_SERVER_H) +#ifndef _SMR_SERVER_H #define _SMR_SERVER_H #include "SM_Server.h" diff --git a/apps/drwho/SM_Client.h b/apps/drwho/SM_Client.h index 884ad94b4de..0a262f71c78 100644 --- a/apps/drwho/SM_Client.h +++ b/apps/drwho/SM_Client.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SM_CLIENT_H) +#ifndef _SM_CLIENT_H #define _SM_CLIENT_H #include "PM_Client.h" diff --git a/apps/drwho/SM_Server.h b/apps/drwho/SM_Server.h index 83aa063cd72..f9fbc9857d1 100644 --- a/apps/drwho/SM_Server.h +++ b/apps/drwho/SM_Server.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SM_SERVER_H) +#ifndef _SM_SERVER_H #define _SM_SERVER_H #include "PM_Server.h" diff --git a/apps/drwho/Search_Struct.h b/apps/drwho/Search_Struct.h index 6b7f12b9750..c45dcbf6086 100644 --- a/apps/drwho/Search_Struct.h +++ b/apps/drwho/Search_Struct.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SEARCH_STRUCT_H) +#ifndef _SEARCH_STRUCT_H #define _SEARCH_STRUCT_H #include "Protocol_Record.h" diff --git a/apps/drwho/Select_Manager.h b/apps/drwho/Select_Manager.h index c4f89b7e57b..0f6af73e443 100644 --- a/apps/drwho/Select_Manager.h +++ b/apps/drwho/Select_Manager.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SELECT_MANAGER_H) +#ifndef _SELECT_MANAGER_H #define _SELECT_MANAGER_H class Select_Manager diff --git a/apps/drwho/Single_Lookup.h b/apps/drwho/Single_Lookup.h index 4b00249ef05..fa86301215e 100644 --- a/apps/drwho/Single_Lookup.h +++ b/apps/drwho/Single_Lookup.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (_SINGLE_LOOKUP_H) +#ifndef _SINGLE_LOOKUP_H #define _SINGLE_LOOKUP_H #include "Options.h" diff --git a/apps/drwho/global.h b/apps/drwho/global.h index 090b20b5b33..d049bd3f43d 100644 --- a/apps/drwho/global.h +++ b/apps/drwho/global.h @@ -17,32 +17,36 @@ // // ============================================================================ -#if !defined (_GLOBAL_H) +#ifndef _GLOBAL_H #define _GLOBAL_H #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + // These constants are used throughout drwho. -enum +enum { MAXUSERIDNAMELEN = 8, - MAX_USER_TIMEOUT = 300, - MAX_HOST_TIMEOUT = 300, + MAX_USER_TIMEOUT = 300, + MAX_HOST_TIMEOUT = 300, UDP_PACKET_SIZE = 1024 * 8, PORT_NUMBER = 12344 }; -// Default name of file where friends info is stored. +// Default name of file where friends info is stored. #define FRIEND_FILE ".friends.dta" -// Default name where rwho info is stored. +// Default name where rwho info is stored. #define RWHODIR "/usr/spool/rwho" -// Macros for handling message types. +// Macros for handling message types. #define GET_PACKET_TYPE(P) (ntohs (*((short *) P))) #define SET_PACKET_TYPE(P,T) ((*(short *) P) = ntohs (T)) #define SKIP_PACKET_TYPE(P) ((P) + sizeof (short)) -#define SUBTRACT_PACKET_TYPE(L) ((L) - sizeof (short)) +#define SUBTRACT_PACKET_TYPE(L) ((L) - sizeof (short)) #endif /* _GLOBAL_H */ diff --git a/apps/gperf/src/Bool_Array.h b/apps/gperf/src/Bool_Array.h index b922adfa517..0e869b1a128 100644 --- a/apps/gperf/src/Bool_Array.h +++ b/apps/gperf/src/Bool_Array.h @@ -21,15 +21,20 @@ along with GNU GPERF; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/ -#if !defined (BOOL_ARRAY_H) +#ifndef BOOL_ARRAY_H #define BOOL_ARRAY_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Options.h" #if defined (ACE_HAS_GPERF) -class Bool_Array +class Bool_Array { // = TITLE // Efficient lookup table abstraction implemented as a "Generation @@ -56,14 +61,14 @@ public: // Reinitializes the array (requires O(1) time). private: - u_long *storage_array_; + u_long *storage_array_; // Initialization of the index space. - u_long generation_number_; + u_long generation_number_; // Keep track of the current Generation. u_long size_; - // Keep track of array size. + // Keep track of array size. }; #endif /* ACE_HAS_GPERF */ diff --git a/apps/gperf/src/Gen_Perf.h b/apps/gperf/src/Gen_Perf.h index 567a7ab0a3c..6d93b1c653f 100644 --- a/apps/gperf/src/Gen_Perf.h +++ b/apps/gperf/src/Gen_Perf.h @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with GNU GPERF; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -#if !defined (GEN_PERF_H) +#ifndef GEN_PERF_H #define GEN_PERF_H #include "Options.h" diff --git a/apps/gperf/src/Hash_Table.h b/apps/gperf/src/Hash_Table.h index 2ac57f444ac..5234f94ce26 100644 --- a/apps/gperf/src/Hash_Table.h +++ b/apps/gperf/src/Hash_Table.h @@ -21,10 +21,15 @@ along with GNU GPERF; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -#if !defined (HASH_TABLE_H) +#ifndef HASH_TABLE_H #define HASH_TABLE_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Options.h" #include "List_Node.h" @@ -32,11 +37,11 @@ USA. */ // @@ This class should be replaced by something in ACE, e.g., // ACE_Hash_Map_Manager. Perhaps we should implement a new // ACE_Hash_Map that uses double hashing, however! -class Hash_Table +class Hash_Table { // = TITLE // Hash table used to check for duplicate keyword entries. - // + // // = DESCRIPTION // This implementation uses "double hashing." public: @@ -48,12 +53,12 @@ public: private: List_Node **table_; - // Vector of pointers to linked lists of List_Node's. + // Vector of pointers to linked lists of List_Node's. size_t size_; - // Size of the vector. + // Size of the vector. - int collisions_; + int collisions_; // Find out how well our double hashing is working! }; diff --git a/apps/gperf/src/Iterator.h b/apps/gperf/src/Iterator.h index 3fc2dee72d9..fc150efdc72 100644 --- a/apps/gperf/src/Iterator.h +++ b/apps/gperf/src/Iterator.h @@ -21,14 +21,19 @@ along with GNU GPERF; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#if !defined (ITERATOR_H) +#ifndef ITERATOR_H #define ITERATOR_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Options.h" #if defined (ACE_HAS_GPERF) -class Iterator +class Iterator { // = TITLE // Provides an Iterator that expands and decodes a control string @@ -52,23 +57,23 @@ public: int operator () (void); private: - char *str; + char *str; // A pointer to the string provided by the user. - int end; - // Value returned after last key is processed. + int end; + // Value returned after last key is processed. - int end_word; + int end_word; // A value marking the abstract ``end of word'' (usually '$'). - int error_value; - // Error value returned when input is syntactically erroneous. + int error_value; + // Error value returned when input is syntactically erroneous. int hi_bound; - // Greatest possible value, inclusive. + // Greatest possible value, inclusive. int lo_bound; - // Smallest possible value, inclusive. + // Smallest possible value, inclusive. }; #endif /* ACE_HAS_GPERF */ diff --git a/apps/gperf/src/Key_List.h b/apps/gperf/src/Key_List.h index bebad1ccc48..1a2d30421a9 100644 --- a/apps/gperf/src/Key_List.h +++ b/apps/gperf/src/Key_List.h @@ -21,7 +21,7 @@ along with GNU GPERF; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -#if !defined (KEY_LIST_H) +#ifndef KEY_LIST_H #define KEY_LIST_H #include "Options.h" diff --git a/apps/gperf/src/List_Node.h b/apps/gperf/src/List_Node.h index d46ffd376fc..59ca19ed1a8 100644 --- a/apps/gperf/src/List_Node.h +++ b/apps/gperf/src/List_Node.h @@ -21,18 +21,23 @@ along with GNU GPERF; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -#if !defined (LIST_NODE_H) +#ifndef LIST_NODE_H #define LIST_NODE_H #include "ace/OS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "Options.h" #if defined (ACE_HAS_GPERF) -class List_Node -{ +class List_Node +{ // = TITLE // Data and function members for defining values and operations of - // a list node. + // a list node. public: // = Initialization and termination methods. List_Node (char *key, int len); @@ -43,32 +48,32 @@ public: static void sort (char *base, int len); - List_Node *link; + List_Node *link; // TRUE if key has an identical KEY_SET as another key. - List_Node *next; - // Points to next element on the list. + List_Node *next; + // Points to next element on the list. char *key; - // Each keyword string stored here. + // Each keyword string stored here. - char *rest; - // Additional information for building hash function. + char *rest; + // Additional information for building hash function. - char *keysig; - // Set of characters to hash, specified by user. + char *keysig; + // Set of characters to hash, specified by user. - int length; - // Length of the key. + int length; + // Length of the key. - int hash_value; - // Hash value for the key. + int hash_value; + // Hash value for the key. - int occurrence; - // A metric for frequency of key set occurrences. + int occurrence; + // A metric for frequency of key set occurrences. int index; - // Position of this node relative to other nodes. + // Position of this node relative to other nodes. }; #endif /* ACE_HAS_GPERF */ diff --git a/apps/gperf/src/Options.h b/apps/gperf/src/Options.h index 8b20aca2742..4b102892a32 100644 --- a/apps/gperf/src/Options.h +++ b/apps/gperf/src/Options.h @@ -21,11 +21,15 @@ along with GNU GPERF; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -#if !defined (OPTIONS_H) +#ifndef OPTIONS_H #define OPTIONS_H #include "ace/Log_Msg.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_GPERF) // Enumerate the potential debugging Options. @@ -52,7 +56,7 @@ enum Option_Type CONSTANT = 0400000, // Make the generated tables readonly (const). CPLUSPLUS = 01000000, // Generate C++ code. C = 02000000, // Generate C code. - ENUM = 04000000, // Use enum for constants. + ENUM = 04000000, // Use enum for constants. STRCASECMP = 010000000, // Use the case insensitive comparison. OPTIMIZE = 020000000, // Assume all input keywords are in the keyset. ADA = 040000000, // Generate Ada code. diff --git a/apps/gperf/src/Vectors.h b/apps/gperf/src/Vectors.h index bc3fa35a3fb..f66a2d5e5a7 100644 --- a/apps/gperf/src/Vectors.h +++ b/apps/gperf/src/Vectors.h @@ -21,28 +21,32 @@ along with GNU GPERF; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ -#if !defined (VECTORS_H) +#ifndef VECTORS_H #define VECTORS_H #include "ace/OS.h" +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #if defined (ACE_HAS_GPERF) class Vectors { - // = TITLE + // = TITLE // Static class data members that are shared between several - // classes via inheritance. + // classes via inheritance. public: - enum + enum { ALPHA_SIZE = 128 }; - static int occurrences[ALPHA_SIZE]; + static int occurrences[ALPHA_SIZE]; // Counts occurrences of each key set character. - static int asso_values[ALPHA_SIZE]; + static int asso_values[ALPHA_SIZE]; // Value associated with each character. }; |