httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_log.c
Date Wed, 10 Mar 2004 21:54:17 GMT
jorton      2004/03/10 13:54:17

  Modified:    modules/ssl ssl_engine_log.c
  Log:
  * modules/ssl/ssl_engine_log.c (ssl_log_annotate, ssl_log_annotation,
  ssl_log_ssl_error): const-ify annotation strings and simplify
  ssl_log_annotation.
  
  Revision  Changes    Path
  1.30      +12 -15    httpd-2.0/modules/ssl/ssl_engine_log.c
  
  Index: ssl_engine_log.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_log.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -w -d -u -r1.29 -r1.30
  --- ssl_engine_log.c	4 Mar 2004 21:54:09 -0000	1.29
  +++ ssl_engine_log.c	10 Mar 2004 21:54:17 -0000	1.30
  @@ -34,9 +34,9 @@
   **  _________________________________________________________________
   */
   
  -static struct {
  -    char *cpPattern;
  -    char *cpAnnotation;
  +static const struct {
  +    const char *cpPattern;
  +    const char *cpAnnotation;
   } ssl_log_annotate[] = {
       { "*envelope*bad*decrypt*", "wrong pass phrase!?" },
       { "*CLIENT_HELLO*unknown*protocol*", "speaking not SSL to HTTPS port!?" },
  @@ -51,19 +51,15 @@
       { NULL, NULL }
   };
   
  -static char *ssl_log_annotation(char *error)
  +static const char *ssl_log_annotation(char *error)
   {
  -    char *errstr;
  -    int i;
  +    int i = 0;
   
  -    errstr = NULL;
  -    for (i = 0; ssl_log_annotate[i].cpPattern != NULL; i++) {
  -        if (ap_strcmp_match(error, ssl_log_annotate[i].cpPattern) == 0) {
  -            errstr = ssl_log_annotate[i].cpAnnotation;
  -            break;
  -        }
  -    }
  -    return errstr;
  +    while (ssl_log_annotate[i].cpPattern != NULL 
  +           && ap_strcmp_match(error, ssl_log_annotate[i].cpPattern) != 0)
  +        i++;
  +
  +    return ssl_log_annotate[i].cpAnnotation;
   }
   
   void ssl_die(void)
  @@ -84,7 +80,8 @@
       unsigned long e;
   
       while ((e = ERR_get_error())) {
  -        char err[256], *annotation;
  +        const char *annotation;
  +        char err[256];
   
           ERR_error_string_n(e, err, sizeof err);
           annotation = ssl_log_annotation(err);
  
  
  

Mime
View raw message