1 files changed, 1 insertions, 1 deletions

diff --git a/kmicromail/libetpan/generic/pop3storage.c b/kmicromail/libetpan/generic/pop3storage.c
index 8e7a94e..375aeaf 100644
--- a/kmicromail/libetpan/generic/pop3storage.c
+++ b/kmicromail/libetpan/generic/pop3storage.c
@@ -1,167 +1,167 @@
 /*
  * libEtPan! -- a mail stuff library
  *
  * Copyright (C) 2001, 2002 - DINH Viet Hoa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the libEtPan! project nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * $Id$
  */
 
 #include "pop3storage.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "mail.h"
 #include "mailstorage_tools.h"
 #include "maildriver.h"
 
 /* pop3 storage */
 
 #define POP3_DEFAULT_PORT  110
 #define POP3S_DEFAULT_PORT 995
 
 static int pop3_mailstorage_connect(struct mailstorage * storage);
 static int pop3_mailstorage_get_folder_session(struct mailstorage * storage,
     char * pathname, mailsession ** result);
 static void pop3_mailstorage_uninitialize(struct mailstorage * storage);
 
 static mailstorage_driver pop3_mailstorage_driver = {
   .sto_name               = "pop3",
   .sto_connect            = pop3_mailstorage_connect,
   .sto_get_folder_session = pop3_mailstorage_get_folder_session,
   .sto_uninitialize       = pop3_mailstorage_uninitialize,
 };
 
 int pop3_mailstorage_init(struct mailstorage * storage,
     char * pop3_servername, uint16_t pop3_port,
     char * pop3_command,
     int pop3_connection_type, int pop3_auth_type,
     char * pop3_login, char * pop3_password,
     int pop3_cached, char * pop3_cache_directory, char * pop3_flags_directory)
 {
   struct pop3_mailstorage * pop3_storage;
 
-  pop3_storage = malloc(sizeof(struct pop3_mailstorage));
+  pop3_storage = malloc(sizeof(* pop3_storage));
   if (pop3_storage == NULL)
     goto err;
   
   pop3_storage->pop3_servername = strdup(pop3_servername);
   if (pop3_storage->pop3_servername == NULL)
     goto free;
 
   pop3_storage->pop3_connection_type = pop3_connection_type;
   
   if (pop3_port == 0) {
     switch (pop3_connection_type) {
     case CONNECTION_TYPE_PLAIN:
     case CONNECTION_TYPE_TRY_STARTTLS:
     case CONNECTION_TYPE_STARTTLS:
     case CONNECTION_TYPE_COMMAND:
     case CONNECTION_TYPE_COMMAND_TRY_STARTTLS:
     case CONNECTION_TYPE_COMMAND_STARTTLS:
       pop3_port = POP3_DEFAULT_PORT;
       break;
 
     case CONNECTION_TYPE_TLS:
     case CONNECTION_TYPE_COMMAND_TLS:
       pop3_port = POP3S_DEFAULT_PORT;
       break;
     }
   }
 
   pop3_storage->pop3_port = pop3_port;
   
   if (pop3_command != NULL) {
     pop3_storage->pop3_command = strdup(pop3_command);
     if (pop3_storage->pop3_command == NULL)
       goto free_servername;
   }
   else
     pop3_storage->pop3_command = NULL;
   
   pop3_storage->pop3_auth_type = pop3_auth_type;
   
   if (pop3_login != NULL) {
     pop3_storage->pop3_login = strdup(pop3_login);
     if (pop3_storage->pop3_login == NULL)
       goto free_command;
   }
   else
     pop3_storage->pop3_login = NULL;
   
   if (pop3_password != NULL) {
     pop3_storage->pop3_password = strdup(pop3_password);
     if (pop3_storage->pop3_password == NULL)
       goto free_login;
   }
   else
     pop3_storage->pop3_password = NULL;
 
   pop3_storage->pop3_cached = pop3_cached;
 
   if (pop3_cached && (pop3_cache_directory != NULL) &&
       (pop3_flags_directory != NULL)) {
     pop3_storage->pop3_cache_directory = strdup(pop3_cache_directory);
     if (pop3_storage->pop3_cache_directory == NULL)
       goto free_password;
     pop3_storage->pop3_flags_directory = strdup(pop3_flags_directory);
     if (pop3_storage->pop3_flags_directory == NULL)
       goto free_cache_directory;
   }
   else {
     pop3_storage->pop3_cached = FALSE;
     pop3_storage->pop3_cache_directory = NULL;
     pop3_storage->pop3_flags_directory = NULL;
   }
 
   storage->sto_data = pop3_storage;
   storage->sto_driver = &pop3_mailstorage_driver;
 
   return MAIL_NO_ERROR;
 
  free_cache_directory:
   free(pop3_storage->pop3_cache_directory);
  free_password:
   if (pop3_storage->pop3_password != NULL)
     free(pop3_storage->pop3_password);
  free_login:
   if (pop3_storage->pop3_login != NULL)
     free(pop3_storage->pop3_login);
  free_command:
   if (pop3_storage->pop3_command != NULL)
     free(pop3_storage->pop3_command);
  free_servername:
   if (pop3_storage->pop3_servername != NULL)
     free(pop3_storage->pop3_servername);
  free:
   free(pop3_storage);
  err:
   return MAIL_ERROR_MEMORY;
 }