author | alwin <alwin> | 2003-12-24 14:48:45 (UTC) |
---|---|---|
committer | alwin <alwin> | 2003-12-24 14:48:45 (UTC) |
commit | 52ccb19535d332f38dcd49f9d115192668c45357 (patch) (unidiff) | |
tree | a13787f882b6b9c664ea91546ce502fcdeda9ed9 /noncore/net/mail | |
parent | 9d2a848b254d6c859d7054d486eedac6535d26ec (diff) | |
download | opie-52ccb19535d332f38dcd49f9d115192668c45357.zip opie-52ccb19535d332f38dcd49f9d115192668c45357.tar.gz opie-52ccb19535d332f38dcd49f9d115192668c45357.tar.bz2 |
some small memleaks again
-rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 25 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 25 |
2 files changed, 22 insertions, 28 deletions
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 0178e33..89ec7ab 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp | |||
@@ -156,14 +156,14 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target ) | |||
156 | } | 156 | } |
157 | 157 | ||
158 | QList<Folder>* IMAPwrapper::listFolders() | 158 | QList<Folder>* IMAPwrapper::listFolders() |
159 | { | 159 | { |
160 | const char *path, *mask; | 160 | const char *path, *mask; |
161 | int err = MAILIMAP_NO_ERROR; | 161 | int err = MAILIMAP_NO_ERROR; |
162 | clist *result; | 162 | clist *result = 0; |
163 | clistcell *current; | 163 | clistcell *current = 0; |
164 | 164 | ||
165 | QList<Folder> * folders = new QList<Folder>(); | 165 | QList<Folder> * folders = new QList<Folder>(); |
166 | folders->setAutoDelete( false ); | 166 | folders->setAutoDelete( false ); |
167 | login(); | 167 | login(); |
168 | if (!m_imap) { | 168 | if (!m_imap) { |
169 | return folders; | 169 | return folders; |
@@ -173,13 +173,12 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
173 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. | 173 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. |
174 | * We must not forget to filter them out in next loop! | 174 | * We must not forget to filter them out in next loop! |
175 | * it seems like ugly code. and yes - it is ugly code. but the best way. | 175 | * it seems like ugly code. and yes - it is ugly code. but the best way. |
176 | */ | 176 | */ |
177 | QString temp; | 177 | QString temp; |
178 | mask = "INBOX" ; | 178 | mask = "INBOX" ; |
179 | result = clist_new(); | ||
180 | mailimap_mailbox_list *list; | 179 | mailimap_mailbox_list *list; |
181 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); | 180 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); |
182 | QString del; | 181 | QString del; |
183 | if ( err == MAILIMAP_NO_ERROR ) { | 182 | if ( err == MAILIMAP_NO_ERROR ) { |
184 | current = result->first; | 183 | current = result->first; |
185 | for ( int i = result->count; i > 0; i-- ) { | 184 | for ( int i = result->count; i > 0; i-- ) { |
@@ -199,13 +198,12 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
199 | /* | 198 | /* |
200 | * second stage - get the other then inbox folders | 199 | * second stage - get the other then inbox folders |
201 | */ | 200 | */ |
202 | mask = "*" ; | 201 | mask = "*" ; |
203 | path = account->getPrefix().latin1(); | 202 | path = account->getPrefix().latin1(); |
204 | if (!path) path = ""; | 203 | if (!path) path = ""; |
205 | result = clist_new(); | ||
206 | qDebug(path); | 204 | qDebug(path); |
207 | bool selectable = true; | 205 | bool selectable = true; |
208 | mailimap_mbx_list_flags*bflags; | 206 | mailimap_mbx_list_flags*bflags; |
209 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | 207 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); |
210 | if ( err == MAILIMAP_NO_ERROR ) { | 208 | if ( err == MAILIMAP_NO_ERROR ) { |
211 | current = result->first; | 209 | current = result->first; |
@@ -225,13 +223,13 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
225 | del = list->mb_delimiter; | 223 | del = list->mb_delimiter; |
226 | folders->append(new IMAPFolder(temp,del,selectable,account->getPrefix())); | 224 | folders->append(new IMAPFolder(temp,del,selectable,account->getPrefix())); |
227 | } | 225 | } |
228 | } else { | 226 | } else { |
229 | qDebug("error fetching folders %s",m_imap->imap_response); | 227 | qDebug("error fetching folders %s",m_imap->imap_response); |
230 | } | 228 | } |
231 | mailimap_list_result_free( result ); | 229 | if (result) mailimap_list_result_free( result ); |
232 | return folders; | 230 | return folders; |
233 | } | 231 | } |
234 | 232 | ||
235 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | 233 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) |
236 | { | 234 | { |
237 | RecMail * m = 0; | 235 | RecMail * m = 0; |
@@ -344,18 +342,18 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
344 | 342 | ||
345 | RecBody IMAPwrapper::fetchBody(const RecMail&mail) | 343 | RecBody IMAPwrapper::fetchBody(const RecMail&mail) |
346 | { | 344 | { |
347 | RecBody body; | 345 | RecBody body; |
348 | const char *mb; | 346 | const char *mb; |
349 | int err = MAILIMAP_NO_ERROR; | 347 | int err = MAILIMAP_NO_ERROR; |
350 | clist *result; | 348 | clist *result = 0; |
351 | clistcell *current; | 349 | clistcell *current; |
352 | mailimap_fetch_att *fetchAtt; | 350 | mailimap_fetch_att *fetchAtt = 0; |
353 | mailimap_fetch_type *fetchType; | 351 | mailimap_fetch_type *fetchType = 0; |
354 | mailimap_set *set; | 352 | mailimap_set *set = 0; |
355 | mailimap_body*body_desc; | 353 | mailimap_body*body_desc = 0; |
356 | 354 | ||
357 | mb = mail.getMbox().latin1(); | 355 | mb = mail.getMbox().latin1(); |
358 | 356 | ||
359 | login(); | 357 | login(); |
360 | if (!m_imap) { | 358 | if (!m_imap) { |
361 | return body; | 359 | return body; |
@@ -364,13 +362,12 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
364 | err = mailimap_select( m_imap, (char*)mb); | 362 | err = mailimap_select( m_imap, (char*)mb); |
365 | if ( err != MAILIMAP_NO_ERROR ) { | 363 | if ( err != MAILIMAP_NO_ERROR ) { |
366 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 364 | qDebug("error selecting mailbox: %s",m_imap->imap_response); |
367 | return body; | 365 | return body; |
368 | } | 366 | } |
369 | 367 | ||
370 | result = clist_new(); | ||
371 | /* the range has to start at 1!!! not with 0!!!! */ | 368 | /* the range has to start at 1!!! not with 0!!!! */ |
372 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); | 369 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); |
373 | fetchAtt = mailimap_fetch_att_new_bodystructure(); | 370 | fetchAtt = mailimap_fetch_att_new_bodystructure(); |
374 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); | 371 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); |
375 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 372 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
376 | mailimap_set_free( set ); | 373 | mailimap_set_free( set ); |
@@ -387,13 +384,13 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
387 | qDebug("Mulitpart mail"); | 384 | qDebug("Mulitpart mail"); |
388 | searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body); | 385 | searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body); |
389 | } | 386 | } |
390 | } else { | 387 | } else { |
391 | qDebug("error fetching body: %s",m_imap->imap_response); | 388 | qDebug("error fetching body: %s",m_imap->imap_response); |
392 | } | 389 | } |
393 | mailimap_fetch_list_free(result); | 390 | if (result) mailimap_fetch_list_free(result); |
394 | return body; | 391 | return body; |
395 | } | 392 | } |
396 | 393 | ||
397 | /* this routine is just called when the mail has only ONE part. | 394 | /* this routine is just called when the mail has only ONE part. |
398 | for filling the parts of a multi-part-message there are other | 395 | for filling the parts of a multi-part-message there are other |
399 | routines 'cause we can not simply fetch the whole body. */ | 396 | routines 'cause we can not simply fetch the whole body. */ |
@@ -506,13 +503,13 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
506 | mailimap_section_spec * section_spec = mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL); | 503 | mailimap_section_spec * section_spec = mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL); |
507 | mailimap_section * section = mailimap_section_new(section_spec); | 504 | mailimap_section * section = mailimap_section_new(section_spec); |
508 | mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section); | 505 | mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section); |
509 | 506 | ||
510 | fetchType = mailimap_fetch_type_new_fetch_att(fetch_att); | 507 | fetchType = mailimap_fetch_type_new_fetch_att(fetch_att); |
511 | 508 | ||
512 | clist*result = clist_new(); | 509 | clist*result = 0; |
513 | 510 | ||
514 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 511 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
515 | mailimap_set_free( set ); | 512 | mailimap_set_free( set ); |
516 | mailimap_fetch_type_free( fetchType ); | 513 | mailimap_fetch_type_free( fetchType ); |
517 | 514 | ||
518 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { | 515 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { |
@@ -530,13 +527,13 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
530 | } | 527 | } |
531 | } | 528 | } |
532 | } | 529 | } |
533 | } else { | 530 | } else { |
534 | qDebug("error fetching text: %s",m_imap->imap_response); | 531 | qDebug("error fetching text: %s",m_imap->imap_response); |
535 | } | 532 | } |
536 | mailimap_fetch_list_free(result); | 533 | if (result) mailimap_fetch_list_free(result); |
537 | return res; | 534 | return res; |
538 | } | 535 | } |
539 | 536 | ||
540 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList) | 537 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList) |
541 | { | 538 | { |
542 | /* current_recursion is for avoiding ugly mails which has a to deep body-structure */ | 539 | /* current_recursion is for avoiding ugly mails which has a to deep body-structure */ |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 0178e33..89ec7ab 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -156,14 +156,14 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target ) | |||
156 | } | 156 | } |
157 | 157 | ||
158 | QList<Folder>* IMAPwrapper::listFolders() | 158 | QList<Folder>* IMAPwrapper::listFolders() |
159 | { | 159 | { |
160 | const char *path, *mask; | 160 | const char *path, *mask; |
161 | int err = MAILIMAP_NO_ERROR; | 161 | int err = MAILIMAP_NO_ERROR; |
162 | clist *result; | 162 | clist *result = 0; |
163 | clistcell *current; | 163 | clistcell *current = 0; |
164 | 164 | ||
165 | QList<Folder> * folders = new QList<Folder>(); | 165 | QList<Folder> * folders = new QList<Folder>(); |
166 | folders->setAutoDelete( false ); | 166 | folders->setAutoDelete( false ); |
167 | login(); | 167 | login(); |
168 | if (!m_imap) { | 168 | if (!m_imap) { |
169 | return folders; | 169 | return folders; |
@@ -173,13 +173,12 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
173 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. | 173 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. |
174 | * We must not forget to filter them out in next loop! | 174 | * We must not forget to filter them out in next loop! |
175 | * it seems like ugly code. and yes - it is ugly code. but the best way. | 175 | * it seems like ugly code. and yes - it is ugly code. but the best way. |
176 | */ | 176 | */ |
177 | QString temp; | 177 | QString temp; |
178 | mask = "INBOX" ; | 178 | mask = "INBOX" ; |
179 | result = clist_new(); | ||
180 | mailimap_mailbox_list *list; | 179 | mailimap_mailbox_list *list; |
181 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); | 180 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); |
182 | QString del; | 181 | QString del; |
183 | if ( err == MAILIMAP_NO_ERROR ) { | 182 | if ( err == MAILIMAP_NO_ERROR ) { |
184 | current = result->first; | 183 | current = result->first; |
185 | for ( int i = result->count; i > 0; i-- ) { | 184 | for ( int i = result->count; i > 0; i-- ) { |
@@ -199,13 +198,12 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
199 | /* | 198 | /* |
200 | * second stage - get the other then inbox folders | 199 | * second stage - get the other then inbox folders |
201 | */ | 200 | */ |
202 | mask = "*" ; | 201 | mask = "*" ; |
203 | path = account->getPrefix().latin1(); | 202 | path = account->getPrefix().latin1(); |
204 | if (!path) path = ""; | 203 | if (!path) path = ""; |
205 | result = clist_new(); | ||
206 | qDebug(path); | 204 | qDebug(path); |
207 | bool selectable = true; | 205 | bool selectable = true; |
208 | mailimap_mbx_list_flags*bflags; | 206 | mailimap_mbx_list_flags*bflags; |
209 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); | 207 | err = mailimap_list( m_imap, (char*)path, (char*)mask, &result ); |
210 | if ( err == MAILIMAP_NO_ERROR ) { | 208 | if ( err == MAILIMAP_NO_ERROR ) { |
211 | current = result->first; | 209 | current = result->first; |
@@ -225,13 +223,13 @@ QList<Folder>* IMAPwrapper::listFolders() | |||
225 | del = list->mb_delimiter; | 223 | del = list->mb_delimiter; |
226 | folders->append(new IMAPFolder(temp,del,selectable,account->getPrefix())); | 224 | folders->append(new IMAPFolder(temp,del,selectable,account->getPrefix())); |
227 | } | 225 | } |
228 | } else { | 226 | } else { |
229 | qDebug("error fetching folders %s",m_imap->imap_response); | 227 | qDebug("error fetching folders %s",m_imap->imap_response); |
230 | } | 228 | } |
231 | mailimap_list_result_free( result ); | 229 | if (result) mailimap_list_result_free( result ); |
232 | return folders; | 230 | return folders; |
233 | } | 231 | } |
234 | 232 | ||
235 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | 233 | RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) |
236 | { | 234 | { |
237 | RecMail * m = 0; | 235 | RecMail * m = 0; |
@@ -344,18 +342,18 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) | |||
344 | 342 | ||
345 | RecBody IMAPwrapper::fetchBody(const RecMail&mail) | 343 | RecBody IMAPwrapper::fetchBody(const RecMail&mail) |
346 | { | 344 | { |
347 | RecBody body; | 345 | RecBody body; |
348 | const char *mb; | 346 | const char *mb; |
349 | int err = MAILIMAP_NO_ERROR; | 347 | int err = MAILIMAP_NO_ERROR; |
350 | clist *result; | 348 | clist *result = 0; |
351 | clistcell *current; | 349 | clistcell *current; |
352 | mailimap_fetch_att *fetchAtt; | 350 | mailimap_fetch_att *fetchAtt = 0; |
353 | mailimap_fetch_type *fetchType; | 351 | mailimap_fetch_type *fetchType = 0; |
354 | mailimap_set *set; | 352 | mailimap_set *set = 0; |
355 | mailimap_body*body_desc; | 353 | mailimap_body*body_desc = 0; |
356 | 354 | ||
357 | mb = mail.getMbox().latin1(); | 355 | mb = mail.getMbox().latin1(); |
358 | 356 | ||
359 | login(); | 357 | login(); |
360 | if (!m_imap) { | 358 | if (!m_imap) { |
361 | return body; | 359 | return body; |
@@ -364,13 +362,12 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
364 | err = mailimap_select( m_imap, (char*)mb); | 362 | err = mailimap_select( m_imap, (char*)mb); |
365 | if ( err != MAILIMAP_NO_ERROR ) { | 363 | if ( err != MAILIMAP_NO_ERROR ) { |
366 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 364 | qDebug("error selecting mailbox: %s",m_imap->imap_response); |
367 | return body; | 365 | return body; |
368 | } | 366 | } |
369 | 367 | ||
370 | result = clist_new(); | ||
371 | /* the range has to start at 1!!! not with 0!!!! */ | 368 | /* the range has to start at 1!!! not with 0!!!! */ |
372 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); | 369 | set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); |
373 | fetchAtt = mailimap_fetch_att_new_bodystructure(); | 370 | fetchAtt = mailimap_fetch_att_new_bodystructure(); |
374 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); | 371 | fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); |
375 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 372 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
376 | mailimap_set_free( set ); | 373 | mailimap_set_free( set ); |
@@ -387,13 +384,13 @@ RecBody IMAPwrapper::fetchBody(const RecMail&mail) | |||
387 | qDebug("Mulitpart mail"); | 384 | qDebug("Mulitpart mail"); |
388 | searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body); | 385 | searchBodyText(mail,body_desc->bd_data.bd_body_mpart,body); |
389 | } | 386 | } |
390 | } else { | 387 | } else { |
391 | qDebug("error fetching body: %s",m_imap->imap_response); | 388 | qDebug("error fetching body: %s",m_imap->imap_response); |
392 | } | 389 | } |
393 | mailimap_fetch_list_free(result); | 390 | if (result) mailimap_fetch_list_free(result); |
394 | return body; | 391 | return body; |
395 | } | 392 | } |
396 | 393 | ||
397 | /* this routine is just called when the mail has only ONE part. | 394 | /* this routine is just called when the mail has only ONE part. |
398 | for filling the parts of a multi-part-message there are other | 395 | for filling the parts of a multi-part-message there are other |
399 | routines 'cause we can not simply fetch the whole body. */ | 396 | routines 'cause we can not simply fetch the whole body. */ |
@@ -506,13 +503,13 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
506 | mailimap_section_spec * section_spec = mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL); | 503 | mailimap_section_spec * section_spec = mailimap_section_spec_new(MAILIMAP_SECTION_SPEC_SECTION_PART, NULL, section_part, NULL); |
507 | mailimap_section * section = mailimap_section_new(section_spec); | 504 | mailimap_section * section = mailimap_section_new(section_spec); |
508 | mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section); | 505 | mailimap_fetch_att * fetch_att = mailimap_fetch_att_new_body_section(section); |
509 | 506 | ||
510 | fetchType = mailimap_fetch_type_new_fetch_att(fetch_att); | 507 | fetchType = mailimap_fetch_type_new_fetch_att(fetch_att); |
511 | 508 | ||
512 | clist*result = clist_new(); | 509 | clist*result = 0; |
513 | 510 | ||
514 | err = mailimap_fetch( m_imap, set, fetchType, &result ); | 511 | err = mailimap_fetch( m_imap, set, fetchType, &result ); |
515 | mailimap_set_free( set ); | 512 | mailimap_set_free( set ); |
516 | mailimap_fetch_type_free( fetchType ); | 513 | mailimap_fetch_type_free( fetchType ); |
517 | 514 | ||
518 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { | 515 | if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { |
@@ -530,13 +527,13 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMail&mail,const QValueList<int> | |||
530 | } | 527 | } |
531 | } | 528 | } |
532 | } | 529 | } |
533 | } else { | 530 | } else { |
534 | qDebug("error fetching text: %s",m_imap->imap_response); | 531 | qDebug("error fetching text: %s",m_imap->imap_response); |
535 | } | 532 | } |
536 | mailimap_fetch_list_free(result); | 533 | if (result) mailimap_fetch_list_free(result); |
537 | return res; | 534 | return res; |
538 | } | 535 | } |
539 | 536 | ||
540 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList) | 537 | void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion,QValueList<int>recList) |
541 | { | 538 | { |
542 | /* current_recursion is for avoiding ugly mails which has a to deep body-structure */ | 539 | /* current_recursion is for avoiding ugly mails which has a to deep body-structure */ |