httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apache-1.3/src/support ab.c
Date Thu, 10 May 2001 17:25:08 GMT
trawick     01/05/10 10:25:06

  Modified:    src/support ab.c
  Log:
  get ab to compile on OS/390 by using strchr() instead of index()
  (we could instead have included the proper header, but this is
  the way Dirk fixed it in 2.0 since we already use strchr() and
  thus had the proper header everywhere)
  
  Get rid of incorrect code to save (and then ignore) the retval
  from signal().  "void *" isn't compatible with any sort of
  function pointer.
  
  Revision  Changes    Path
  1.50      +4 -6      apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- ab.c	2001/04/11 21:23:54	1.49
  +++ ab.c	2001/05/10 17:25:00	1.50
  @@ -1323,14 +1323,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -	printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.49 $> apache-1.3");
  +	printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.50 $> apache-1.3");
   	printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
   	printf("Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/\n");
   	printf("\n");
       }
       else {
   	printf("<p>\n");
  -	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-1.3<br>\n",
VERSION, "$Revision: 1.49 $");
  +	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-1.3<br>\n",
VERSION, "$Revision: 1.50 $");
   	printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
   	printf(" Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/<br>\n");
   	printf("</p>\n<p>\n");
  @@ -1460,8 +1460,6 @@
   {
       int c, r, l;
       char tmp[1024];
  -    void *res;			/* Result pointer for signal handler
  -				 * installation */
   
       /* table defaults  */
       tablestring = "";
  @@ -1576,7 +1574,7 @@
   		/*
   		 * assume proxy-name[:port]
   		 */
  -		if (p = index(optarg, ':')) {
  +		if (p = strchr(optarg, ':')) {
   		    *p = '\0';
   		    p++;
   		    proxyport = atoi(p);
  @@ -1649,7 +1647,7 @@
   	exit(1);
       }
   #endif
  -    res = signal(SIGPIPE, SIG_IGN);	/* Ignore writes to connections that
  +    signal(SIGPIPE, SIG_IGN);	        /* Ignore writes to connections that
   					 * have been closed at the other end.
   					 * These writes are dealt with in the
   					 * s_write() function. */
  
  
  

Mime
View raw message