yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-05 19:42:04 +02:00
Code Issues Releases Wiki Activity

Removed redundant clist helper, added some logging

Browse source
This commit is contained in:
VP- 2019-03-08 16:27:27 +01:00
parent 250b42c3d8
commit 364d7d77e6
3 changed files with 9 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/dc_job.c
View file

@ -227,7 +227,7 @@ static int dc_add_smtp_job(dc_context_t* context, int action, dc_mimefactory_t*
}
// store recipients in job param
recipients = clist_join(mimefactory->recipients_addr, 0x1e);
recipients = dc_str_from_clist(mimefactory->recipients_addr, "\x1e");
dc_param_set(param, DC_PARAM_FILE, pathNfilename);
dc_param_set(param, DC_PARAM_RECIPIENTS, recipients);
@ -336,8 +336,7 @@ static void dc_job_do_DC_JOB_SEND(dc_context_t* context, dc_job_t* job)
void* buf = NULL;
size_t buf_bytes = 0;
char* recipients = NULL;
clist* recipients_list = clist_new();
char* saveptr = NULL;
clist* recipients_list = NULL;
sqlite3_stmt* stmt = NULL;
/* connect to SMTP server, if not yet done */
@ -355,6 +354,7 @@ static void dc_job_do_DC_JOB_SEND(dc_context_t* context, dc_job_t* job)
/* load message data */
filename = dc_param_get(job->param, DC_PARAM_FILE, NULL);
if (!filename) {
dc_log_warning(context, 0, "Missing file name for job %d", job->job_id);
goto cleanup;
}
if (!dc_read_file(context, filename, &buf, &buf_bytes)) {
@ -364,11 +364,10 @@ static void dc_job_do_DC_JOB_SEND(dc_context_t* context, dc_job_t* job)
/* get the list of recipients */
recipients = dc_param_get(job->param, DC_PARAM_RECIPIENTS, NULL);
if (!recipients) {
dc_log_warning(context, 0, "Missing recipients for job %d", job->job_id);
goto cleanup;
}
for (char* r = strtok_r(recipients, "\x1e", &saveptr); r; r = strtok_r(NULL, "\x1e", &saveptr)) {
clist_append(recipients_list, r);
}
recipients_list = dc_str_to_clist(recipients, "\x1e");
/* send message */
{
@ -405,7 +404,10 @@ static void dc_job_do_DC_JOB_SEND(dc_context_t* context, dc_job_t* job)
cleanup:
sqlite3_finalize(stmt);
clist_free(recipients_list); // not clist_free_content() because strtok_r() returns pointers into recipients
if (recipients_list) {
clist_free_content(recipients_list);
clist_free(recipients_list);
}
free(recipients);
free(buf);
free(filename);

27
src/dc_tools.c
View file

@ -658,33 +658,6 @@ int clist_search_string_nocase(const clist* haystack, const char* needle)
}
char* clist_join(const clist* list, char separator)
{
size_t total = 0;
for (clistiter* iter=clist_begin(list); iter!=NULL; iter=clist_next(iter)) {
char* str = clist_content(iter);
total += strlen(str) + 1; // the 1 is for separators and \0
}
if (total==0) {
return dc_strdup("");
}
char* result = malloc(total);
if (!result) {
exit(55); /* cannot allocate little memoty, unrecoverable error */
}
char* p = result;
for (clistiter* iter=clist_begin(list); iter!=NULL; iter=clist_next(iter)) {
const char* str = clist_content(iter);
size_t len = strlen(str);
memcpy(p, str, len);
p += len;
*(p++) = separator;
}
*(--p) = 0;
return result;
}
/*******************************************************************************
* date/time tools
******************************************************************************/

1
src/dc_tools.h
View file

@ -54,7 +54,6 @@ char* encode_base64 (const char * in, int len);
/* clist tools */
void clist_free_content (const clist*); /* calls free() for each item content */
int clist_search_string_nocase (const clist*, const char* str);
char* clist_join (const clist*, char separator);
/* date/time tools */
#define DC_INVALID_TIMESTAMP (-1)