Crypto: remove unneded initialization pointed out by clang static analyzer.

[citadel.git] / citadel / modules / crypto / serv_crypto.c

diff --git a/citadel/modules/crypto/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c
index 6afeee84bc7c0b7a643ea51fce35093bff23932a..ea542821912b1244f53ee394e1d50c36f575c471 100644 (file)
--- a/citadel/modules/crypto/serv_crypto.c
+++ b/citadel/modules/crypto/serv_crypto.c
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *  
+ *  
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  
+ *  
+ *  
  */
 
 #include <string.h>
@@ -79,7 +79,7 @@ void destruct_ssl(void)
 
 void init_ssl(void)
 {
-       SSL_METHOD *ssl_method;
+       const SSL_METHOD *ssl_method;
        DH *dh;
        RSA *rsa=NULL;
        X509_REQ *req = NULL;
@@ -471,11 +471,10 @@ int client_readline_sslbuffer(StrBuf *Line, StrBuf *IOBuf, const char **Pos, int
        CitContext *CCC = CC;
        const char *pos = NULL;
        const char *pLF;
-       int len, rlen, retlen;
+       int len, rlen;
        int nSuccessLess = 0;
        const char *pch = NULL;
        
-       retlen = 0;
        if ((Line == NULL) ||
            (Pos == NULL) ||
            (IOBuf == NULL))
@@ -498,7 +497,7 @@ int client_readline_sslbuffer(StrBuf *Line, StrBuf *IOBuf, const char **Pos, int
                        StrBufAppendBufPlain(Line, pos, 
                                             StrLength(IOBuf) - (pos - ChrPtr(IOBuf)), 0);
                        FlushStrBuf(IOBuf);
-                       pos = *Pos = NULL;
+                       *Pos = NULL;
                }
                else {
                        int n = 0;
@@ -511,7 +510,7 @@ int client_readline_sslbuffer(StrBuf *Line, StrBuf *IOBuf, const char **Pos, int
 
                        if (StrLength(IOBuf) <= (pch - ChrPtr(IOBuf) + 1)) {
                                FlushStrBuf(IOBuf);
-                               pos = *Pos = NULL;
+                               *Pos = NULL;
                        }
                        else 
                                *Pos = pch + 1;