Commit 435515cd authored by Jeff Trawick's avatar Jeff Trawick
Browse files

cleanups to function signatures, prototypes, visibility 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089600 13f79535-47bb-0310-9956-ffa450edef68
parent 462b4d0d

os/win32/os.h

+1 −1
Changes for os/win32/os.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ typedef enum { 


FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal);



PSECURITY_ATTRIBUTES GetNullACL();

PSECURITY_ATTRIBUTES GetNullACL(void);

void CleanNullACL(void *sa);



int set_listeners_noninheritable(apr_pool_t *p);

os/win32/util_win32.c

+1 −1
Changes for os/win32/util_win32.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal) 
/* To share the semaphores with other processes, we need a NULL ACL

 * Code from MS KB Q106387

 */

PSECURITY_ATTRIBUTES GetNullACL()

PSECURITY_ATTRIBUTES GetNullACL(void)

{

    PSECURITY_DESCRIPTOR pSD;

    PSECURITY_ATTRIBUTES sa;

server/mpm/winnt/child.c

+1 −1
Changes for server/mpm/winnt/child.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static void cleanup_thread(HANDLE *handles, int *thread_cnt, 
 * monitors the child process for maintenance and shutdown

 * events.

 */

static void create_listener_thread()

static void create_listener_thread(void)

{

    unsigned tid;

    int num_listeners = 0;

server/mpm/winnt/mpm_winnt.c

+4 −4
Changes for server/mpm/winnt/mpm_winnt.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ AP_DECLARE(apr_array_header_t *) ap_get_status_table(apr_pool_t *p) 
 * Command processors

 */



static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, char *arg)

static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, const char *arg)

{

    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);

    if (err != NULL) {
@@ -258,7 +258,7 @@ AP_DECLARE(void) ap_signal_parent(ap_signal_parent_e type) 
 *   start mutex [signal from the parent to begin accept()]

 *   scoreboard shm handle [to recreate the ap_scoreboard]

 */

void get_handles_from_parent(server_rec *s, HANDLE *child_exit_event,

static void get_handles_from_parent(server_rec *s, HANDLE *child_exit_event,

                                    apr_proc_mutex_t **child_start_mutex,

                                    apr_shm_t **scoreboard_shm)

{
@@ -423,7 +423,7 @@ static int send_handles_to_child(apr_pool_t *p, 
 * exclusively in the child process, receives them from the parent and

 * makes them availeble in the child.

 */

void get_listeners_from_parent(server_rec *s)

static void get_listeners_from_parent(server_rec *s)

{

    WSAPROTOCOL_INFO WSAProtocolInfo;

    ap_listen_rec *lr;
@@ -962,7 +962,7 @@ static int inst_argc; 
static const char * const *inst_argv;

static const char *service_name = NULL;



void winnt_rewrite_args(process_rec *process)

static void winnt_rewrite_args(process_rec *process)

{

    /* Handle the following SCM aspects in this phase:

     *

server/mpm/winnt/mpm_winnt.h

+4 −0
Changes for server/mpm/winnt/mpm_winnt.h: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -89,5 +89,9 @@ typedef enum { 
AP_DECLARE(void) ap_signal_parent(ap_signal_parent_e type);



void hold_console_open_on_error(void);



/* From child.c: */

void child_main(apr_pool_t *pconf);



#endif /* APACHE_MPM_WINNT_H */

/** @} */