cvs commit: modperl-2.0/xs/Apache/SubProcess Apache__SubProcess.h

[stas]

stas        01/12/17 20:29:04

  Modified:    xs/Apache/SubProcess Apache__SubProcess.h
  Log:
  pass THX to modperl_spawn_proc_prog() and use it to s/croak/Perl_croak/
  
  Revision  Changes    Path
  1.7       +6 -8      modperl-2.0/xs/Apache/SubProcess/Apache__SubProcess.h
  
  Index: Apache__SubProcess.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/SubProcess/Apache__SubProcess.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Apache__SubProcess.h      2001/12/18 03:54:49     1.6
  +++ Apache__SubProcess.h      2001/12/18 04:29:04     1.7
  @@ -21,7 +21,8 @@
       apr_file_pipe_timeout_set(fp, \
                                 (int)(r->server->timeout * APR_USEC_PER_SEC))
   
  -static int modperl_spawn_proc_prog(request_rec *r,
  +static int modperl_spawn_proc_prog(pTHX_
  +                                   request_rec *r,
                                      const char *command,
                                      const char ***argv,
                                      apr_file_t **script_in,
  @@ -76,22 +77,19 @@
       apr_pool_note_subprocess(p, procnew, kill_after_timeout);
   
       if (!(*script_in = procnew->in)) {
  -        /* XXX: this needs to be Perl_croak(aTHX_ ...)
  -         * or go away so we can compile with -DPERL_CORE
  -         */
  -        croak("broken program-in stream");
  +        Perl_croak(aTHX_ "broken program-in stream");
           return APR_EBADF;
       }
       SET_TIMEOUT(*script_in);
   
       if (!(*script_out = procnew->out)) {
  -        croak("broken program-out stream");
  +        Perl_croak(aTHX_ "broken program-out stream");
           return APR_EBADF;
       }
       SET_TIMEOUT(*script_in);
   
       if (!(*script_err = procnew->err)) {
  -        croak("broken program-err stream");
  +        Perl_croak(aTHX_ "broken program-err stream");
           return APR_EBADF;
       }
       SET_TIMEOUT(*script_err);
  @@ -157,7 +155,7 @@
                         i, argv[i] ? argv[i] : "NULL");
           }
   #endif
  -        rc = modperl_spawn_proc_prog(r, command, &argv,
  +        rc = modperl_spawn_proc_prog(aTHX_ r, command, &argv,
                                        &script_in, &script_out,
                                        &script_err);