httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <trawi...@bellsouth.net>
Subject Re: cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c service.c
Date Thu, 01 Jun 2000 12:28:29 GMT
> From: wrowe@locus.apache.org
> Date: 1 Jun 2000 03:20:10 -0000
> wrowe       00/05/31 20:20:09
> 
>   Modified:    src/modules/mpm/winnt mpm_winnt.c service.c
>   Log:
>     Just a few error cleanups for tonight.
>   

...

I don't really know what I'm talking about, but I have a couple of
questions... 

>   Revision  Changes    Path
>   1.74      +12 -11    apache-2.0/src/modules/mpm/winnt/mpm_winnt.c
>   
>   Index: mpm_winnt.c
>   ===================================================================
>   RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/mpm_winnt.c,v
>   retrieving revision 1.73
>   retrieving revision 1.74
>   diff -u -r1.73 -r1.74
>   --- mpm_winnt.c	2000/05/31 15:28:51	1.73
>   +++ mpm_winnt.c	2000/06/01 03:20:09	1.74
>   @@ -1819,7 +1819,8 @@
>            /* WARNING: There is an implict assumption here that the
>             * executable resides in the ServerRoot!
>             */
>   -        ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), NULL, 
>   +        rv = GetLastError();
>   +        ap_log_error(APLOG_MARK,APLOG_ERR, rv, NULL, 
>                         "Failed to get the running module's file name");
>            exit(1);
>        }
>   @@ -1923,14 +1924,14 @@
>                rv = mpm_merge_service_args(process->pool, mpm_new_argv, 
>                                            fixed_args);
>                if (rv != APR_SUCCESS) {
>   -                ap_log_error(APLOG_MARK,APLOG_ERR, rv, server_conf,
>   +                ap_log_error(APLOG_MARK,APLOG_ERR, rv, NULL,
>                                 "%s: ConfigArgs are missing from the registry.",
>                                 display_name);
>                }
>            }
>            else
>            {
>   -            ap_log_error(APLOG_MARK,APLOG_ERR, APR_BADARG, server_conf,
>   +            ap_log_error(APLOG_MARK,APLOG_ERR, APR_BADARG, NULL,
>                     "%s: No installed service by that name.", display_name);
>                exit(1);
>            }
>   @@ -1939,7 +1940,7 @@
>        {
>            if (service_named == APR_SUCCESS) 
>            {
>   -            ap_log_error(APLOG_MARK,APLOG_ERR, APR_BADARG, server_conf,
>   +            ap_log_error(APLOG_MARK,APLOG_ERR, APR_BADARG, NULL,
>                     "%s: Service is already installed.", display_name);
>                exit(1);
>            }
>   @@ -1970,8 +1971,8 @@
>        if (!strcasecmp(signal_arg, "runservice")
>                && (osver.dwPlatformId == VER_PLATFORM_WIN32_NT)
>                && (service_to_start_success != APR_SUCCESS)) {
>   -        ap_log_error(APLOG_MARK,APLOG_ERR, service_to_start_success, 
>   -                     server_conf, "%s: Unable to start the service manager.",
>   +        ap_log_error(APLOG_MARK,APLOG_ERR, service_to_start_success, NULL, 
>   +                     "%s: Unable to start the service manager.",
>                         display_name);
>            exit(1);
>        }
>   @@ -2013,18 +2014,18 @@
>         */
>    
>        if (!strcasecmp(signal_arg, "install")) {
>   -        mpm_service_install(ptemp, inst_argc, inst_argv);
>   -        exit(rv);
>   +        rv = mpm_service_install(ptemp, inst_argc, inst_argv);
>   +        exit (rv);

Can I start putting opening braces where God intended :) ? (style of
call to function exit())

>        }
>    
>        if (!strcasecmp(signal_arg, "start")) {
>            rv = mpm_service_start(ptemp, inst_argc, inst_argv);
>   -        exit(rv);
>   +        exit (rv);
>        }
>    
>        if (!strcasecmp(signal_arg, "restart")) {
>            mpm_signal_service(ptemp, ap_pid_fname, 1);
>   -        exit(0);
>   +        exit (rv);

Where does rv come from for this exit() call?

-- 
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
     http://www.geocities.com/SiliconValley/Park/9289/
          Born in Roswell... married an alien...

Mime
View raw message