From: Guenter Knauf Date: Sat, 26 Feb 2011 09:34:47 +0000 (+0000) Subject: Axed C++ comments and tabs. X-Git-Tag: 2.3.11~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abcb9e30113207f5cff62427a8f3b872eb655a08;p=thirdparty%2Fapache%2Fhttpd.git Axed C++ comments and tabs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1074809 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/httpd.h b/include/httpd.h index b2357b59185..63312295483 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -1997,30 +1997,30 @@ AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c); #ifdef AP_DEBUG #undef strchr -# define strchr(s, c) ap_strchr(s,c) +# define strchr(s, c) ap_strchr(s,c) #undef strrchr -# define strrchr(s, c) ap_strrchr(s,c) +# define strrchr(s, c) ap_strrchr(s,c) #undef strstr # define strstr(s, c) ap_strstr(s,c) #else /** use this instead of strchr */ -# define ap_strchr(s, c) strchr(s, c) +# define ap_strchr(s, c) strchr(s, c) /** use this instead of strchr */ -# define ap_strchr_c(s, c) strchr(s, c) +# define ap_strchr_c(s, c) strchr(s, c) /** use this instead of strrchr */ -# define ap_strrchr(s, c) strrchr(s, c) +# define ap_strrchr(s, c) strrchr(s, c) /** use this instead of strrchr */ -# define ap_strrchr_c(s, c) strrchr(s, c) +# define ap_strrchr_c(s, c) strrchr(s, c) /** use this instead of strrstr*/ -# define ap_strstr(s, c) strstr(s, c) +# define ap_strstr(s, c) strstr(s, c) /** use this instead of strrstr*/ -# define ap_strstr_c(s, c) strstr(s, c) +# define ap_strstr_c(s, c) strstr(s, c) #endif -#define AP_NORESTART APR_OS_START_USEERR + 1 +#define AP_NORESTART APR_OS_START_USEERR + 1 #ifdef __cplusplus } diff --git a/modules/arch/netware/mod_nw_ssl.c b/modules/arch/netware/mod_nw_ssl.c index 20707d3d3de..2750a17d766 100644 --- a/modules/arch/netware/mod_nw_ssl.c +++ b/modules/arch/netware/mod_nw_ssl.c @@ -291,7 +291,7 @@ static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *serve } if (mutual) { - optParam = 0x07; // SO_SSL_AUTH_CLIENT + optParam = 0x07; /* SO_SSL_AUTH_CLIENT */ if(WSAIoctl(s, SO_SSL_SET_FLAGS, (char*)&optParam, sizeof(optParam), NULL, 0, NULL, NULL, NULL)) { @@ -346,17 +346,17 @@ static int convert_secure_socket(conn_rec *c, apr_socket_t *csd) sWS2Opts.options = &sNWTLSOpts; if (numcerts) { - sNWTLSOpts.walletProvider = WAL_PROV_DER; //the wallet provider defined in wdefs.h - sNWTLSOpts.TrustedRootList = certarray; //array of certs in UNICODE format - sNWTLSOpts.numElementsInTRList = numcerts; //number of certs in TRList + sNWTLSOpts.walletProvider = WAL_PROV_DER; /* the wallet provider defined in wdefs.h */ + sNWTLSOpts.TrustedRootList = certarray; /* array of certs in UNICODE format */ + sNWTLSOpts.numElementsInTRList = numcerts; /* number of certs in TRList */ } else { /* setup the socket for SSL */ unicpy(keyFileName, L"SSL CertificateIP"); - sWS2Opts.wallet = keyFileName; /* no client certificate */ + sWS2Opts.wallet = keyFileName; /* no client certificate */ sWS2Opts.walletlen = unilen(keyFileName); - sNWTLSOpts.walletProvider = WAL_PROV_KMO; //the wallet provider defined in wdefs.h + sNWTLSOpts.walletProvider = WAL_PROV_KMO; /* the wallet provider defined in wdefs.h */ } /* make the IOCTL call */ @@ -406,7 +406,7 @@ static int SSLize_Socket(SOCKET socketHnd, char *key, request_rec *r) loc2uni(UNI_LOCAL_DEFAULT, SASKey, key, 0, 0); - //setup the tlsserveropts struct + /* setup the tlsserveropts struct */ sWS2Opts.wallet = SASKey; sWS2Opts.walletlen = unilen(SASKey); sWS2Opts.sidtimeout = 0; @@ -414,7 +414,7 @@ static int SSLize_Socket(SOCKET socketHnd, char *key, request_rec *r) sWS2Opts.siddir = NULL; sWS2Opts.options = &sNWTLSOpts; - //setup the nwtlsopts structure + /* setup the nwtlsopts structure */ sNWTLSOpts.walletProvider = WAL_PROV_KMO; sNWTLSOpts.keysList = NULL; diff --git a/os/win32/os.h b/os/win32/os.h index 2a70bf84d91..cd1d28c54ff 100644 --- a/os/win32/os.h +++ b/os/win32/os.h @@ -80,11 +80,11 @@ AP_DECLARE_DATA extern int ap_real_exit_code; AP_DECLARE(apr_status_t) ap_os_proc_filepath(char **binpath, apr_pool_t *p); typedef enum { - AP_DLL_WINBASEAPI = 0, // kernel32 From WinBase.h - AP_DLL_WINADVAPI = 1, // advapi32 From WinBase.h - AP_DLL_WINSOCKAPI = 2, // mswsock From WinSock.h - AP_DLL_WINSOCK2API = 3, // ws2_32 From WinSock2.h - AP_DLL_defined = 4 // must define as last idx_ + 1 + AP_DLL_WINBASEAPI = 0, /* kernel32 From WinBase.h */ + AP_DLL_WINADVAPI = 1, /* advapi32 From WinBase.h */ + AP_DLL_WINSOCKAPI = 2, /* mswsock From WinSock.h */ + AP_DLL_WINSOCK2API = 3, /* ws2_32 From WinSock2.h */ + AP_DLL_defined = 4 /* must define as last idx_ + 1 */ } ap_dlltoken_e; FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal); diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c index 7bc9e22154f..adfea4a1e6e 100644 --- a/server/mpm/winnt/service.c +++ b/server/mpm/winnt/service.c @@ -694,19 +694,19 @@ apr_status_t mpm_service_install(apr_pool_t *ptemp, int argc, * depend on it. */ /* ###: utf-ize */ - schService = CreateService(schSCManager, // SCManager database - mpm_service_name, // name of service - mpm_display_name, // name to display - SERVICE_ALL_ACCESS, // access required - SERVICE_WIN32_OWN_PROCESS, // service type - SERVICE_AUTO_START, // start type - SERVICE_ERROR_NORMAL, // error control type - launch_cmd, // service's binary - NULL, // no load svc group - NULL, // no tag identifier - "Tcpip\0Afd\0", // dependencies - NULL, // use SYSTEM account - NULL); // no password + schService = CreateService(schSCManager, /* SCManager database */ + mpm_service_name, /* name of service */ + mpm_display_name, /* name to display */ + SERVICE_ALL_ACCESS, /* access required */ + SERVICE_WIN32_OWN_PROCESS, /* service type */ + SERVICE_AUTO_START, /* start type */ + SERVICE_ERROR_NORMAL, /* error control type */ + launch_cmd, /* service's binary */ + NULL, /* no load svc group */ + NULL, /* no tag identifier */ + "Tcpip\0Afd\0", /* dependencies */ + NULL, /* use SYSTEM account */ + NULL); /* no password */ if (!schService) { @@ -893,7 +893,7 @@ void mpm_signal_service(apr_pool_t *ptemp, int signal) SC_HANDLE schService; SC_HANDLE schSCManager; - schSCManager = OpenSCManager(NULL, NULL, // default machine & database + schSCManager = OpenSCManager(NULL, NULL, /* default machine & database */ SC_MANAGER_CONNECT); if (!schSCManager) {