You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2007/09/28 11:56:54 UTC
svn commit: r580278 - in /webservices/axis2/trunk/c/util/include: ./
platforms/unix/ platforms/windows/
Author: samisa
Date: Fri Sep 28 02:56:53 2007
New Revision: 580278
URL: http://svn.apache.org/viewvc?rev=580278&view=rev
Log:
Fixed indentation
Modified:
webservices/axis2/trunk/c/util/include/axutil_env.h
webservices/axis2/trunk/c/util/include/axutil_utils_defines.h
webservices/axis2/trunk/c/util/include/axutil_version.h
webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h
webservices/axis2/trunk/c/util/include/platforms/windows/axutil_dir_windows.h
webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h
webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h
Modified: webservices/axis2/trunk/c/util/include/axutil_env.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_env.h?rev=580278&r1=580277&r2=580278&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_env.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_env.h Fri Sep 28 02:56:53 2007
@@ -189,10 +189,10 @@
const axutil_env_t * env);
/*#define AXIS2_ENV_CHECK(env, error_return) \
- if(!env) \
- { \
- return error_return; \
- }*/
+ if(!env) \
+ { \
+ return error_return; \
+ } */
#define AXIS2_ENV_CHECK(env, error_return)
Modified: webservices/axis2/trunk/c/util/include/axutil_utils_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_utils_defines.h?rev=580278&r1=580277&r2=580278&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_utils_defines.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_utils_defines.h Fri Sep 28 02:56:53 2007
@@ -77,11 +77,13 @@
#else
#define AXIS2_CALL
+
#endif
#else
#if defined(__unix)
#define AXIS2_CALL
+
#else /* WIN32 */
#define AXIS2_CALL __stdcall
#endif
@@ -120,11 +122,13 @@
/**
* Axis2 Core functions are declared with AXIS2_EXTERN AXIS2_CALL
+
, so they may
* use the most appropriate calling convention. Other
* Core functions with variable arguments must use AXIS2_DECLARE_NONSTD().
* @code
* AXIS2_EXTERN rettype) axis2_func(args AXIS2_CALL
+
* @endcode
*/
Modified: webservices/axis2/trunk/c/util/include/axutil_version.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_version.h?rev=580278&r1=580277&r2=580278&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_version.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_version.h Fri Sep 28 02:56:53 2007
@@ -100,15 +100,19 @@
{
int major;
+
/**< major number */
int minor;
+
/**< minor number */
int patch;
+
/**< patch number */
int is_dev;
+
/**< is development (1 or 0) */
}
axis2_version_t;
Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h?rev=580278&r1=580277&r2=580278&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h Fri Sep 28 02:56:53 2007
@@ -124,7 +124,7 @@
#include <unistd.h>
#endif /*HAVE_UNISTD_H */
- /* network handling*/
+ /* network handling */
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netinet/in.h>
@@ -161,7 +161,7 @@
* @return the error message. NOTE: The caller is responsible for deleting the returned string
*/
- /*#define AXIS2_PLATFORM_GET_ERROR_MESSAGE(errorNumber) new string(strerror(errorNumber));*/
+ /*#define AXIS2_PLATFORM_GET_ERROR_MESSAGE(errorNumber) new string(strerror(errorNumber)); */
/**
* Platform specific method to obtain current thread ID
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axutil_dir_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axutil_dir_windows.h?rev=580278&r1=580277&r2=580278&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axutil_dir_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axutil_dir_windows.h Fri Sep 28 02:56:53 2007
@@ -25,99 +25,99 @@
#include <sys/types.h>
#include <windows.h>
#include <axutil_utils_defines.h>
-
+
/* struct dirent - same as Unix dirent.h */
struct dirent
{
-
long d_ino; /* inode number (always 1 in WIN32) */
-
off_t d_off; /* offset to this dirent */
-
unsigned short d_reclen; /* length of d_name */
-
char d_name[_MAX_FNAME + 1]; /* filename (null terminated) */
-
+
long d_ino; /* inode number (always 1 in WIN32) */
+
off_t d_off; /* offset to this dirent */
+
unsigned short d_reclen; /* length of d_name */
+
char d_name[_MAX_FNAME + 1]; /* filename (null terminated) */
+
/*unsigned char d_type; *//*type of file */
};
-
+
/* def struct DIR - different from Unix DIR */
typedef struct
{
-
long handle; /* _findfirst/_findnext handle */
-
short offset; /* offset into directory */
-
short finished; /* 1 if there are not more files */
-
struct _finddata_t fileinfo; /* from _findfirst/_findnext */
-
char *dirname; /* the dir we are reading */
-
struct dirent dent; /* the dirent to return */
-
+
long handle; /* _findfirst/_findnext handle */
+
short offset; /* offset into directory */
+
short finished; /* 1 if there are not more files */
+
struct _finddata_t fileinfo; /* from _findfirst/_findnext */
+
char *dirname; /* the dir we are reading */
+
struct dirent dent; /* the dirent to return */
+
}
-DIR;
-
+
DIR;
+
/* Function prototypes */
-
+
/**
* open a directory on a given name
* returns a DIR if successful, or NULL if the path cannot be opened
*/
AXIS2_EXTERN DIR * AXIS2_CALL
-opendir(const char *);
-
+
opendir(const char *);
+
/**
* Close the directory stream DIRP.
* Return 0 if successful, -1 otherwise.
*/
AXIS2_EXTERN int AXIS2_CALL
-closedir(
- DIR *);
-
+
closedir(
+
DIR *);
+
/**
* Read a directory entry from DIRP. Return a pointer to a `struct
* dirent' describing the entry, or NULL for EOF or error.
*/
AXIS2_EXTERN struct dirent *AXIS2_CALL
-
readdir(
- DIR *);
-
+
readdir(
+
DIR *);
+
/**
* Reentrant version of `readdir'
*/
AXIS2_EXTERN int AXIS2_CALL
-
readdir_r(
- DIR *,
- struct dirent *,
- struct dirent **);
-
+
readdir_r(
+
DIR *,
+
struct dirent *,
+
struct dirent **);
+
/**
* Rewind DIRP to the beginning of the directory.
*/
AXIS2_EXTERN int AXIS2_CALL
-rewinddir(
- DIR *);
-
+
rewinddir(
+
DIR *);
+
/**
* Scan the directory DIR
* Returns the number of entries selected, or -1 on error
*/
AXIS2_EXTERN int AXIS2_CALL
-
scandir(
- const char *_dirname,
- struct dirent **__namelist[],
- int(*selector)(const struct dirent * entry),
- int(*compare)(const struct dirent ** a,
- const struct dirent ** b));
-
+
scandir(
+
const char *_dirname,
+
struct dirent **__namelist[],
+
int(*selector)(const struct dirent * entry),
+
int(*compare)(const struct dirent ** a,
+
const struct dirent ** b));
+
/**
* Compare two `struct dirent's alphabetically
*/
extern int
alphasort(
- const struct dirent **__d1,
- const struct dirent **__d2);
-
+
const struct dirent **__d1,
+
const struct dirent **__d2);
+
#endif /* READDIR_H */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h?rev=580278&r1=580277&r2=580278&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axutil_uuid_gen_windows.h Fri Sep 28 02:56:53 2007
@@ -23,24 +23,24 @@
#ifdef __cplusplus
extern "C"
{
-#endif /*
*/
-
+#endif /*
*/
+
/* Function prototypes */
-
+
/**
* Generate universally unique id
* @return a char pointer to uuid
*/
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
- axutil_platform_uuid_gen(
- char *s);
-
+
axutil_platform_uuid_gen(
+
char *s);
+
/** @} */
#ifdef __cplusplus
}
#endif /*
*/
-#endif /* AXIS2_UDDI_GEN_WINDOWS_H */
+#endif /* AXIS2_UDDI_GEN_WINDOWS_H */
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h?rev=580278&r1=580277&r2=580278&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h Fri Sep 28 02:56:53 2007
@@ -36,10 +36,10 @@
*/
/*enum platform_error_codes
- {
+ {
PLATFORM_ERROR_UUID_NO_ADDRESS = 0,
PLATFORM_ERROR_OUT_OF_MEMORY = 1
- };*/
+ }; */
#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
#include <windows.h>
@@ -47,11 +47,11 @@
/*for minizip uncompression library */
# include <direct.h>
- /*for file access check*/
+ /*for file access check */
#include <io.h>
#include <sys/stat.h>
- /*for network handling*/
+ /*for network handling */
#include <winsock2.h>
#include <fcntl.h>
#include <Mswsock.h>
@@ -190,8 +190,8 @@
searched and the file exists * /
/**
- * windows specific directory handling functions
- */
+ * windows specific directory handling functions
+ */
#define AXIS2_SCANDIR scandir
#define AXIS2_ALPHASORT alphasort
#define AXIS2_OPENDIR opendir
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org