*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)

*Fix a possible crash in Spell::DoAllEffectOnTarget

--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-17 15:35:07 -07:00
parent f21f47005d
commit 26b5e033ff
2257 changed files with 750 additions and 103852 deletions
-46
View File
@@ -1,5 +1,4 @@
// -*- C++ -*-
//=============================================================================
/**
* @file OS_TLI.h
@@ -10,25 +9,19 @@
*/
//=============================================================================
#ifndef ACE_OS_TLI_H
# define ACE_OS_TLI_H
# include /**/ "ace/pre.h"
# include "ace/config-all.h"
# if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
# include "ace/OS_Errno.h"
# include "ace/ACE_export.h"
# if defined (ACE_EXPORT_MACRO)
# undef ACE_EXPORT_MACRO
# endif
# define ACE_EXPORT_MACRO ACE_Export
# if !(defined(ACE_HAS_TLI) || defined(ACE_HAS_XTI))
// Dummies to help compilation.
struct t_call { };
@@ -39,16 +32,13 @@ struct t_discon { };
struct t_unitdata { };
struct t_uderr { };
struct netbuf { };
# else /* !(ACE_HAS_TLI || ACE_HAS_XTI) */
# if defined (ACE_HAS_CONFLICTING_XTI_MACROS)
// Make sure tcp.h gets included before sys/xti.h.
# include "ace/os_include/netinet/os_tcp.h"
# undef TCP_NODELAY
# undef TCP_MAXSEG
# endif /* ACE_HAS_CONFLICTING_XTI_MACROS */
# if defined (ACE_HAS_XTI)
# if defined (ACE_HAS_SYS_XTI_H) /* Nonstandard header placement */
# define class ace_xti_class
@@ -63,7 +53,6 @@ struct netbuf { };
# else
# include /**/ <xti.h>
# endif /* ACE_HAS_SYS_XTI_H */
// The XTI API for obtaining local/peer addresses is t_getprotaddr().
// The ACE API was developed in TLI days and so uses t_getname().
// t_getname() has a type argument that specifies which address is
@@ -77,10 +66,8 @@ struct netbuf { };
# if !defined (REMOTENAME)
# define REMOTENAME 1
# endif
# else /* !ACE_HAS_XTI, so this is a TLI system */
# if !defined (ACE_HAS_TLI_PROTOTYPES)
// Define ACE_TLI headers for systems that don't prototype them....
extern "C"
{
@@ -114,7 +101,6 @@ extern "C"
int t_unbind(int fildes);
}
# endif /* !ACE_HAS_TLI_PROTOTYPES */
# if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C)
extern "C" {
# endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */
@@ -126,7 +112,6 @@ extern "C" {
# if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C)
}
# endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */
# if defined (ACE_HAS_SVR4_TLI)
// t_getname is a TLI extension added by some platforms before XTI
// was widely available. However, it's not often in the system's
@@ -134,11 +119,8 @@ extern "C" {
extern "C" int t_getname (int, struct netbuf *, int);
# endif /* ACE_HAS_SVR4_TLI */
# endif /* !ACE_HAS_XTI */
# endif /* ACE_HAS_XTI || ACE_HAS_TLI */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
// This hack is needed to get around an odd and hard-to-reproduce problem
// with HP aC++. If struct sigaction is defined extern "C" and the sigaction
// function in namespace ACE_OS, the compiler sometimes gets confused.
@@ -157,7 +139,6 @@ typedef extern "C" struct t_bind ACE_TBIND;
typedef struct t_optmgmt ACE_TOPTMGMT;
typedef struct t_bind ACE_TBIND;
#endif
/**
* @namespace ACE_OS
*
@@ -172,107 +153,81 @@ namespace ACE_OS
ACE_HANDLE resfd,
struct t_call
*call);
ACE_NAMESPACE_INLINE_FUNCTION
char *t_alloc (ACE_HANDLE fildes,
int struct_type,
int
fields);
ACE_NAMESPACE_INLINE_FUNCTION
int t_bind (ACE_HANDLE fildes,
ACE_TBIND *req,
ACE_TBIND *ret);
ACE_NAMESPACE_INLINE_FUNCTION
int t_close (ACE_HANDLE fildes);
ACE_NAMESPACE_INLINE_FUNCTION
int t_connect (ACE_HANDLE fildes,
struct t_call *sndcall,
struct t_call *rcvcall);
ACE_NAMESPACE_INLINE_FUNCTION
void t_error (const char *errmsg);
ACE_NAMESPACE_INLINE_FUNCTION
int t_free (char *ptr,
int struct_type);
ACE_NAMESPACE_INLINE_FUNCTION
int t_getinfo (ACE_HANDLE fildes,
struct t_info *info);
ACE_NAMESPACE_INLINE_FUNCTION
int t_getname (ACE_HANDLE fildes,
struct netbuf *namep,
int type);
ACE_NAMESPACE_INLINE_FUNCTION
int t_getstate (ACE_HANDLE fildes);
ACE_NAMESPACE_INLINE_FUNCTION
int t_listen (ACE_HANDLE fildes,
struct t_call *call);
ACE_NAMESPACE_INLINE_FUNCTION
int t_look (ACE_HANDLE fildes);
ACE_NAMESPACE_INLINE_FUNCTION
ACE_HANDLE t_open (char *path,
int oflag,
struct t_info *info);
ACE_NAMESPACE_INLINE_FUNCTION
int t_optmgmt (ACE_HANDLE handle,
ACE_TOPTMGMT *req,
ACE_TOPTMGMT *ret);
ACE_NAMESPACE_INLINE_FUNCTION
int t_rcv (ACE_HANDLE fildes,
char *buf,
unsigned int nbytes,
int *flags);
ACE_NAMESPACE_INLINE_FUNCTION
int t_rcvdis (ACE_HANDLE fildes,
struct t_discon *discon);
ACE_NAMESPACE_INLINE_FUNCTION
int t_rcvrel (ACE_HANDLE fildes);
ACE_NAMESPACE_INLINE_FUNCTION
int t_rcvudata (ACE_HANDLE fildes,
struct t_unitdata *unitdata,
int *flags);
ACE_NAMESPACE_INLINE_FUNCTION
int t_rcvuderr (ACE_HANDLE fildes,
struct t_uderr *uderr);
ACE_NAMESPACE_INLINE_FUNCTION
int t_snd (ACE_HANDLE fildes,
const char *buf,
unsigned int nbytes,
int flags);
ACE_NAMESPACE_INLINE_FUNCTION
int t_snddis (ACE_HANDLE fildes,
struct t_call *call);
ACE_NAMESPACE_INLINE_FUNCTION
int t_sndrel (ACE_HANDLE fildes);
ACE_NAMESPACE_INLINE_FUNCTION
int t_sync (ACE_HANDLE fildes);
ACE_NAMESPACE_INLINE_FUNCTION
int t_unbind (ACE_HANDLE fildes);
} /* namespace ACE_OS */
ACE_END_VERSIONED_NAMESPACE_DECL
# if defined (ACE_HAS_INLINED_OSCALLS)
# if defined (ACE_INLINE)
# undef ACE_INLINE
@@ -280,7 +235,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# define ACE_INLINE inline
# include "ace/OS_TLI.inl"
# endif /* ACE_HAS_INLINED_OSCALLS */
#include /**/ "ace/post.h"
#endif /* ACE_OS_TLI_H */