[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-68-g8deaba9

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  8deaba9bad41463b7e93a2205f254923a93558ce (commit)
      from  cb02215daa8ee1a11974a22491d7c24d6d516f94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 8deaba9bad41463b7e93a2205f254923a93558ce
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Mar 4 11:41:07 2010 +0100

    Mass update: reindent preprocessor macro directives.

diff --git a/myserver/include/base/crypt/sha1.h 
b/myserver/include/base/crypt/sha1.h
index 7d9f21a..ff65ee5 100644
--- a/myserver/include/base/crypt/sha1.h
+++ b/myserver/include/base/crypt/sha1.h
@@ -23,7 +23,7 @@
 
 extern "C"
 {
-#include <sha1.h>
+# include <sha1.h>
 }
 
 # include "myserver.h"
diff --git a/myserver/include/base/process/fork_server.h 
b/myserver/include/base/process/fork_server.h
index 72da869..fa39269 100644
--- a/myserver/include/base/process/fork_server.h
+++ b/myserver/include/base/process/fork_server.h
@@ -20,11 +20,11 @@
 
 # include "myserver.h"
 
-#ifndef WIN32
-# include <unistd.h>
-#endif
+# ifndef WIN32
+#  include <unistd.h>
+# endif
 
-#include <include/base/unix_socket/unix_socket.h>
+# include <include/base/unix_socket/unix_socket.h>
 
 
 struct StartProcInfo;
diff --git a/myserver/include/base/read_directory/read_directory.h 
b/myserver/include/base/read_directory/read_directory.h
index c8e58c2..9bdc7ef 100644
--- a/myserver/include/base/read_directory/read_directory.h
+++ b/myserver/include/base/read_directory/read_directory.h
@@ -67,7 +67,7 @@ public:
   u_long st_nlink;
 # else
   nlink_t st_nlink;
-#endif
+# endif
 
   int findfirst (const char *directory);
   int findfirst (string &directory) {return findfirst (directory.c_str ());};
diff --git a/myserver/include/base/socket/ssl_socket.h 
b/myserver/include/base/socket/ssl_socket.h
index cb8a415..ff947de 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -24,8 +24,8 @@
 
 extern "C"
 {
-#  include <sys/types.h>
-#  include <sys/socket.h>
+# include <sys/types.h>
+# include <sys/socket.h>
 }
 
 # include <include/base/socket/socket.h>
diff --git a/myserver/include/plugin/plugin.h b/myserver/include/plugin/plugin.h
index 721310a..e6423a9 100644
--- a/myserver/include/plugin/plugin.h
+++ b/myserver/include/plugin/plugin.h
@@ -19,13 +19,13 @@
 #ifndef PLUGIN_H
 # define PLUGIN_H
 
-#ifdef WIN32
-# define EXPORTABLE(x) x _declspec(dllexport)
-#else
-# define EXPORTABLE(x) extern "C" x
+# ifdef WIN32
+#  define EXPORTABLE(x) x _declspec(dllexport)
+# else
+#  define EXPORTABLE(x) extern "C" x
 # endif
 
-#define PLUGIN_NAME(X) static const char * __name = X; \
+# define PLUGIN_NAME(X) static const char * __name = X; \
         EXPORTABLE(const char*) name (){return X;}
 
 # include "myserver.h"
diff --git a/myserver/include/protocol/ftp/ftp_parser.h 
b/myserver/include/protocol/ftp/ftp_parser.h
index 8c68e77..13e0c20 100644
--- a/myserver/include/protocol/ftp/ftp_parser.h
+++ b/myserver/include/protocol/ftp/ftp_parser.h
@@ -129,7 +129,7 @@ typedef union YYSTYPE
 {
 
   /* Line 1676 of yacc.c  */
-#line 15 "ftp_parser.ypp"
+# line 15 "ftp_parser.ypp"
 
   int           m_nInt;
   char          m_nChar;
@@ -139,7 +139,7 @@ typedef union YYSTYPE
 
 
   /* Line 1676 of yacc.c  */
-#line 143 "../../../include/protocol/ftp/ftp_parser.h"
+# line 143 "../../../include/protocol/ftp/ftp_parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/myserver/include/protocol/gopher/engine.h 
b/myserver/include/protocol/gopher/engine.h
index a6d29ee..f060b27 100644
--- a/myserver/include/protocol/gopher/engine.h
+++ b/myserver/include/protocol/gopher/engine.h
@@ -18,12 +18,12 @@
 */
 
 #ifndef GOPHER_ENGINE_H
-#define GOPHER_ENGINE_H
+# define GOPHER_ENGINE_H
 
-#include "myserver.h"
-#include <include/base/hash_map/hash_map.h>
-#include <include/conf/vhost/vhost.h>
-#include <include/base/base64/mime_utils.h>
+# include "myserver.h"
+# include <include/base/hash_map/hash_map.h>
+# include <include/conf/vhost/vhost.h>
+# include <include/base/base64/mime_utils.h>
 
 using namespace std;
 
diff --git a/myserver/include/protocol/gopher/gopher_content.h 
b/myserver/include/protocol/gopher/gopher_content.h
index f18014f..622f031 100644
--- a/myserver/include/protocol/gopher/gopher_content.h
+++ b/myserver/include/protocol/gopher/gopher_content.h
@@ -18,15 +18,15 @@
 */
 
 #ifndef GOPHER_CONTENT_H
-#define GOPHER_CONTENT_H
-
-#include "myserver.h"
-#include <include/base/socket/socket.h>
-#include <include/base/mem_buff/mem_buff.h>
-#include <include/base/file/file.h>
-#include <include/connection/connection.h>
-#include <vector>
-#include <string>
+# define GOPHER_CONTENT_H
+
+# include "myserver.h"
+# include <include/base/socket/socket.h>
+# include <include/base/mem_buff/mem_buff.h>
+# include <include/base/file/file.h>
+# include <include/connection/connection.h>
+# include <vector>
+# include <string>
 
 using namespace std;
 
diff --git a/myserver/myserver.h b/myserver/myserver.h
index 748aacf..ede34f1 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -17,35 +17,35 @@
 */
 
 #ifndef STDAFX_H
-#define STDAFX_H
+# define STDAFX_H
 
 extern "C"
 {
-#include "config.h"
+# include "config.h"
 
-#ifdef HAVE_PTHREAD
-# include <pthread.h>
-#endif
+# ifdef HAVE_PTHREAD
+#  include <pthread.h>
+# endif
 }
 
 extern "C"
 {
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <math.h>
-#include "time.h"
-#include <ctype.h>
-#include <stdint.h>
-
-#ifdef WIN32
-# include <tchar.h>
-# include <process.h>
-#else
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <limits.h>
-#endif
+# include <stdlib.h>
+# include <stdio.h>
+# include <fcntl.h>
+# include <math.h>
+# include "time.h"
+# include <ctype.h>
+# include <stdint.h>
+
+# ifdef WIN32
+#  include <tchar.h>
+#  include <process.h>
+# else
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#  include <limits.h>
+# endif
 }
 
 typedef void* HANDLE;
diff --git a/myserver/src/base/multicast/multicast.cpp 
b/myserver/src/base/multicast/multicast.cpp
index 1214bc9..99ec6e8 100644
--- a/myserver/src/base/multicast/multicast.cpp
+++ b/myserver/src/base/multicast/multicast.cpp
@@ -18,8 +18,8 @@
 #ifndef MULTICAST_CPP
 # define MULTICAST_CPP
 
-#include "myserver.h"
-#include <include/base/multicast/multicast.h>
+# include "myserver.h"
+# include <include/base/multicast/multicast.h>
 
 
 /*!
diff --git a/myserver/src/base/socket/ssl_socket.cpp 
b/myserver/src/base/socket/ssl_socket.cpp
index 4c9231a..ceca2cf 100644
--- a/myserver/src/base/socket/ssl_socket.cpp
+++ b/myserver/src/base/socket/ssl_socket.cpp
@@ -31,10 +31,10 @@ extern "C"
 #ifdef WIN32
 # include <w32sock.h>
 #else
-#include <netdb.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+# include <netdb.h>
+# include <unistd.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
 #endif
 }
 
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 009123d..615157f 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -29,7 +29,7 @@ extern "C"
 # include <direct.h>
 #endif
 
-# include <argp.h>
+#include <argp.h>
 
 #ifndef WIN32
 # include <string.h>

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/crypt/sha1.h                 |    2 +-
 myserver/include/base/process/fork_server.h        |    8 ++--
 .../include/base/read_directory/read_directory.h   |    2 +-
 myserver/include/base/socket/ssl_socket.h          |    4 +-
 myserver/include/plugin/plugin.h                   |   10 ++--
 myserver/include/protocol/ftp/ftp_parser.h         |    4 +-
 myserver/include/protocol/gopher/engine.h          |   10 ++--
 myserver/include/protocol/gopher/gopher_content.h  |   18 ++++----
 myserver/myserver.h                                |   42 ++++++++++----------
 myserver/src/base/multicast/multicast.cpp          |    4 +-
 myserver/src/base/socket/ssl_socket.cpp            |    8 ++--
 myserver/src/myserver.cpp                          |    2 +-
 12 files changed, 57 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
GNU MyServer