From cbb1aa8b3a5cd5c983c8fef7a5964dd5f26448c7 Mon Sep 17 00:00:00 2001 From: robs Date: Thu, 30 Oct 2003 01:08:34 +0000 Subject: [PATCH] Remove all C++ style comments (even in the WIN code) --- fcgi_config.c | 6 +++--- fcgi_pm.c | 16 ++++++++-------- fcgi_util.c | 10 +++++----- mod_fastcgi.c | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fcgi_config.c b/fcgi_config.c index c5c4ea9..4591478 100644 --- a/fcgi_config.c +++ b/fcgi_config.c @@ -1,5 +1,5 @@ /* - * $Id: fcgi_config.c,v 1.48 2003/06/24 01:31:24 robs Exp $ + * $Id: fcgi_config.c,v 1.49 2003/10/30 01:08:34 robs Exp $ */ #define CORE_PRIVATE @@ -657,8 +657,8 @@ const char *fcgi_config_new_static_server(cmd_parms *cmd, void *dummy, const cha #ifdef WIN32 - // TCP FastCGI applications require SystemRoot be present in the environment - // Put it in both for consistency to the application + /* TCP FastCGI applications require SystemRoot be present in the environment + * Put it in both for consistency to the application */ fcgi_config_set_env_var(p, envp, &envc, "SystemRoot"); mutex = CreateMutex(NULL, FALSE, fs_path); diff --git a/fcgi_pm.c b/fcgi_pm.c index edcedd1..f389078 100644 --- a/fcgi_pm.c +++ b/fcgi_pm.c @@ -1,5 +1,5 @@ /* - * $Id: fcgi_pm.c,v 1.88 2003/10/28 02:26:12 robs Exp $ + * $Id: fcgi_pm.c,v 1.89 2003/10/30 01:08:34 robs Exp $ */ @@ -195,7 +195,7 @@ static int init_listen_sock(fcgi_server * fs) if ((fs->listenFd = socket(fs->socket_addr->sa_family, SOCK_STREAM, 0)) < 0) { #ifdef WIN32 - errno = WSAGetLastError(); // Not sure if this will work as expected + errno = WSAGetLastError(); /* Not sure if this will work as expected */ #endif ap_log_error(FCGI_LOG_CRIT_ERRNO, fcgi_apache_main_server, "FastCGI: can't create %sserver \"%s\": socket() failed", @@ -646,7 +646,7 @@ CLEANUP: memset(&pi, 0, sizeof(pi)); memset(&r, 0, sizeof(r)); - // Can up a fake request to pass to ap_get_win32_interpreter() + /* Can up a fake request to pass to ap_get_win32_interpreter() */ r.per_dir_config = fcgi_apache_main_server->lookup_defaults; r.server = fcgi_apache_main_server; r.filename = (char *) fs->fs_path; @@ -685,7 +685,7 @@ CLEANUP: si.wShowWindow = SW_HIDE; si.hStdInput = listen_handle; - // XXX These should be open to the error_log + /* XXX These should be open to the error_log */ si.hStdOutput = INVALID_HANDLE_VALUE; si.hStdError = INVALID_HANDLE_VALUE; @@ -1495,8 +1495,8 @@ static void dynamic_kill_idle_fs_procs(void) #ifdef WIN32 -// This is a little bogus, there's gotta be a better way to do this -// Can we use WaitForMultipleObjects() +/* This is a little bogus, there's gotta be a better way to do this + * Can we use WaitForMultipleObjects() */ #define FCGI_PROC_WAIT_TIME 100 void child_wait_thread_main(void *dummy) { @@ -1641,7 +1641,7 @@ void fcgi_pm_main(void *dummy) #endif #ifdef WIN32 - // Add SystemRoot to the dynamic environment + /* Add SystemRoot to the dynamic environment */ char ** envp = dynamicEnvp; for (i = 0; *envp; ++i) { ++envp; @@ -2058,7 +2058,7 @@ ChildFound: goto ProcessSigTerm; } else { - // Have an received an unknown event - should not happen + /* Have an received an unknown event - should not happen */ ap_log_error(FCGI_LOG_CRIT, fcgi_apache_main_server, "FastCGI: WaitForMultipleobjects() return an unrecognized event"); diff --git a/fcgi_util.c b/fcgi_util.c index d6660a2..1edcbe8 100644 --- a/fcgi_util.c +++ b/fcgi_util.c @@ -1,5 +1,5 @@ /* - * $Id: fcgi_util.c,v 1.29 2002/10/22 02:44:15 robs Exp $ + * $Id: fcgi_util.c,v 1.30 2003/10/30 01:08:34 robs Exp $ */ #include "fcgi.h" @@ -248,9 +248,9 @@ fcgi_util_check_access(pool *tp, if (mode & _S_IWRITE && !(statBuf->st_mode & _S_IWRITE)) return "write not allowed"; - // I don't think this works on FAT, but since I don't know how to check.. - // if (mode & _S_IEXEC && !(statBuf->st_mode & _S_IEXEC)) - // return "execute not allowed"; + /* I don't think this works on FAT, but since I don't know how to check.. + * if (mode & _S_IEXEC && !(statBuf->st_mode & _S_IEXEC)) + * return "execute not allowed"; */ #endif #if !defined(__EMX__) && !defined(WIN32) @@ -508,7 +508,7 @@ fcgi_util_fs_create_procs(pool *p, int num) int fcgi_util_ticks(struct timeval * tv) { #ifdef WIN32 - // millisecs is sufficent granularity + /* millisecs is sufficent granularity */ DWORD millis = GetTickCount(); tv->tv_sec = millis / 1000; diff --git a/mod_fastcgi.c b/mod_fastcgi.c index 949b2f2..35b7e88 100644 --- a/mod_fastcgi.c +++ b/mod_fastcgi.c @@ -3,7 +3,7 @@ * * Apache server module for FastCGI. * - * $Id: mod_fastcgi.c,v 1.154 2003/10/30 00:59:21 robs Exp $ + * $Id: mod_fastcgi.c,v 1.155 2003/10/30 01:08:34 robs Exp $ * * Copyright (c) 1995-1996 Open Market, Inc. * @@ -1114,7 +1114,7 @@ static int open_connection_to_fs(fcgi_request *fr) if (stat(socket_path, &sock_stat) == 0) #endif { - // It exists + /* It exists */ if (dynamicAutoUpdate) { struct stat app_stat; @@ -1223,7 +1223,7 @@ static int open_connection_to_fs(fcgi_request *fr) fcgi_util_ticks(&fr->startTime); { - // xxx this handle should live somewhere (see CloseHandle()s below too) + /* xxx this handle should live somewhere (see CloseHandle()s below too) */ char * wait_npipe_mutex_name, * cp; wait_npipe_mutex_name = cp = ap_pstrdup(rp, socket_path); while ((cp = strchr(cp, '\\'))) *cp = '/'; @@ -1287,10 +1287,10 @@ static int open_connection_to_fs(fcgi_request *fr) fr->fd = (SOCKET) CreateFile(socket_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, // no security attributes - OPEN_EXISTING, // opens existing pipe + NULL, /* no security attributes */ + OPEN_EXISTING, /* opens existing pipe */ FILE_FLAG_OVERLAPPED, - NULL); // no template file + NULL); /* no template file */ if (fr->fd != (SOCKET) INVALID_HANDLE_VALUE) { @@ -1346,7 +1346,7 @@ static int open_connection_to_fs(fcgi_request *fr) #ifdef WIN32 if (fr->fd == INVALID_SOCKET) { - errno = WSAGetLastError(); // Not sure this is going to work as expected + errno = WSAGetLastError(); /* Not sure this is going to work as expected */ #else if (fr->fd < 0) { #endif @@ -2915,7 +2915,7 @@ static const command_rec fastcgi_cmds[] = static void register_hooks(apr_pool_t * p) { - // ap_hook_pre_config(x_pre_config, NULL, NULL, APR_HOOK_MIDDLE); + /* ap_hook_pre_config(x_pre_config, NULL, NULL, APR_HOOK_MIDDLE); */ ap_hook_post_config(init_module, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_child_init(fcgi_child_init, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_handler(content_handler, NULL, NULL, APR_HOOK_MIDDLE); -- 2.11.4.GIT