cvs commit: httpd-2.0/support ab.c htdigest.c

[wr...@apache.org]

wrowe       01/01/18 15:54:14

  Modified:    support  ab.c htdigest.c
  Log:
    When is a void fn(void) not a void fn(void)?  It's a win32'ism, since
    the APR_DECLARE (excluding _NONSTD) uses the pascal convention.  Really
    irrelevant in a function that never needs to clean up (atexit), but
    the compiler complains.  Possible workarounds, but that would break
    non-c lanaguge code from linking into apr.
  
  Revision  Changes    Path
  1.51      +8 -3      httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- ab.c	2001/01/15 20:22:30	1.50
  +++ ab.c	2001/01/18 23:54:13	1.51
  @@ -903,14 +903,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.50 $> apache-2.0");
  +        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.51 $> apache-2.0");
           printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
           printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
           printf("\n");
       }
       else {
           printf("<p>\n");
  -        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.50 $");
  +        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.51 $");
           printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
           printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
           printf("</p>\n<p>\n");
  @@ -1025,6 +1025,11 @@
       return 0;
   }
   
  +static void terminate(void)
  +{
  +    apr_terminate();
  +}
  +
   /* ------------------------------------------------------- */
   
   /* sort out command-line args and call test */
  @@ -1046,7 +1051,7 @@
       hdrs[0] = '\0';
   
       apr_initialize();
  -    atexit(apr_terminate);
  +    atexit(terminate);
       apr_create_pool(&cntxt, NULL);
   
   #ifdef NOT_ASCII
  
  
  
  1.20      +6 -1      httpd-2.0/support/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- htdigest.c	2001/01/09 04:09:43	1.19
  +++ htdigest.c	2001/01/18 23:54:14	1.20
  @@ -215,6 +215,11 @@
       exit(1);
   }
   
  +static void terminate(void)
  +{
  +    apr_terminate();
  +}
  +
   int main(int argc, char *argv[])
   {
       apr_file_t *tfp = NULL, *f;
  @@ -234,7 +239,7 @@
                   apr_strerror(rv, line, sizeof(line)), rv);
           exit(1);
       }
  -    atexit(apr_terminate); 
  +    atexit(terminate); 
       apr_create_pool(&cntxt, NULL);
   
   #if APR_CHARSET_EBCDIC