httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aa...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_util.c
Date Thu, 15 Nov 2001 17:29:01 GMT
aaron       01/11/15 09:29:01

  Modified:    modules/ssl ssl_util.c
  Log:
  Style updates before I convert to the new lock type.
  
  Revision  Changes    Path
  1.18      +21 -18    httpd-2.0/modules/ssl/ssl_util.c
  
  Index: ssl_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ssl_util.c	2001/08/24 06:34:26	1.17
  +++ ssl_util.c	2001/11/15 17:29:01	1.18
  @@ -108,8 +108,9 @@
                                strlen(szFrom), bPad);
   }
   
  -void ssl_util_uuencode_binary(
  -    unsigned char *szTo, const unsigned char *szFrom, int nLength, BOOL bPad)
  +void ssl_util_uuencode_binary(unsigned char *szTo,
  +                              const unsigned char *szFrom,
  +                              int nLength, BOOL bPad)
   {
       const unsigned char *s;
       int nPad = 0;
  @@ -129,8 +130,9 @@
           *szTo++ = ssl_util_uuencode_six2pr[s[2] & 0x3f];
           --nLength;
       }
  -    while(bPad && nPad--)
  +    while(bPad && nPad--) {
           *szTo++ = NUL;
  +    }
       *szTo = NUL;
       return;
   }
  @@ -246,8 +248,8 @@
       return cp;
   }
   
  -char *ssl_util_ptxtsub(
  -    apr_pool_t *p, const char *cpLine, const char *cpMatch, char *cpSubst)
  +char *ssl_util_ptxtsub(apr_pool_t *p, const char *cpLine,
  +                       const char *cpMatch, char *cpSubst)
   {
   #define MAX_PTXTSUB 100
       char *cppMatch[MAX_PTXTSUB];
  @@ -287,7 +289,9 @@
        * Pass 2: allocate memory and assemble result
        */
       cpResult = apr_pcalloc(p, nResult+1);
  -    for (cpI = (char *)cpLine, cpO = cpResult, i = 0; cppMatch[i] != NULL; i++) {
  +    for (cpI = (char *)cpLine, cpO = cpResult, i = 0;
  +         cppMatch[i] != NULL;
  +         i++) {
           apr_cpystrn(cpO, cpI, cppMatch[i]-cpI+1);
           cpO += (cppMatch[i]-cpI);
           apr_cpystrn(cpO, cpSubst, nSubst+1);
  @@ -299,27 +303,26 @@
       return cpResult;
   }
   
  -apr_status_t
  -ssl_util_setmodconfig(
  -    server_rec *s, const char *key, SSLModConfigRec *mc)
  +apr_status_t ssl_util_setmodconfig(server_rec *s, const char *key,
  +                                   SSLModConfigRec *mc)
   {
  -    return apr_pool_userdata_set((void *)mc, key, apr_pool_cleanup_null, s->process->pool);
  +    return apr_pool_userdata_set((void *)mc, key, apr_pool_cleanup_null,
  +                                 s->process->pool);
   }
   
  -SSLModConfigRec *
  -ssl_util_getmodconfig(
  -    server_rec *s, const char *key)
  +SSLModConfigRec *ssl_util_getmodconfig(server_rec *s, const char *key)
   {
       SSLModConfigRec *mc = NULL;
   
  -    if (apr_pool_userdata_get((void **)&mc, key, s->process->pool) != APR_SUCCESS)
  -        ssl_log(s, SSL_LOG_TRACE, "Unable to retrieve SSLModConfig from global pool");
  +    if (apr_pool_userdata_get((void **)&mc, key, s->process->pool)
  +        != APR_SUCCESS) {
  +        ssl_log(s, SSL_LOG_TRACE,
  +                "Unable to retrieve SSLModConfig from global pool");
  +    }
       return mc;
   }
   
  -SSLModConfigRec *
  -ssl_util_getmodconfig_ssl(
  -    SSL *ssl, const char *key)
  +SSLModConfigRec *ssl_util_getmodconfig_ssl(SSL *ssl, const char *key)
   {
       conn_rec *c = (conn_rec *)SSL_get_app_data(ssl);
       SSLModConfigRec *mc = NULL;
  
  
  

Mime
View raw message