#include "mutt.h"
#include "imap_private.h"
-#include <lib-sys/mutt_ssl.h>
/* -- public functions -- */
* Returns NULL on failure (no mem) */
IMAP_DATA *imap_new_idata (void)
{
- return p_new(IMAP_DATA, 1);
+ IMAP_DATA *res = p_new(IMAP_DATA, 1);
+ buffer_init(&res->cmd.buf);
+ return res;
}
/* imap_free_idata: Release and clear storage in an IMAP_DATA structure. */
void imap_free_idata (IMAP_DATA ** idata)
{
- if (!idata)
- return;
-
- p_delete(&(*idata)->capstr);
- string_list_wipe(&(*idata)->flags);
- p_delete(&((*idata)->cmd.buf));
- p_delete(idata);
+ if (*idata) {
+ p_delete(&(*idata)->capstr);
+ string_list_wipe(&(*idata)->flags);
+ buffer_wipe(&((*idata)->cmd.buf));
+ p_delete(idata);
+ }
}
/*
struct tm t;
time_t tz;
- t.tm_mday = (s[0] == ' ' ? s[1] - '0' : (s[0] - '0') * 10 + (s[1] - '0'));
- s += 2;
- if (*s != '-')
+ t.tm_mday = strtol(s, &s, 10);
+ if (*s++ != '-')
return 0;
- s++;
- t.tm_mon = mutt_check_month (s);
+ t.tm_mon = mutt_check_month(s);
s += 3;
- if (*s != '-')
+ if (*s++ != '-')
return 0;
- s++;
- t.tm_year =
- (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] -
- '0') -
- 1900;
- s += 4;
- if (*s != ' ')
+ t.tm_year = strtol(s, &s, 10) - 1900;
+ if (*s++ != ' ')
return 0;
- s++;
/* time */
- t.tm_hour = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ':')
+ t.tm_hour = strtol(s, &s, 10);
+ if (*s++ != ':')
return 0;
- s++;
- t.tm_min = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ':')
+ t.tm_min = strtol(s, &s, 10);
+ if (*s++ != ':')
return 0;
- s++;
- t.tm_sec = (s[0] - '0') * 10 + (s[1] - '0');
- s += 2;
- if (*s != ' ')
+ t.tm_sec = strtol(s, &s, 10);
+ if (*s++ != ' ')
return 0;
- s++;
/* timezone */
- tz = ((s[1] - '0') * 10 + (s[2] - '0')) * 3600 +
- ((s[3] - '0') * 10 + (s[4] - '0')) * 60;
+ tz = strtol(s + 1, NULL, 10);
+ tz = (tz / 100) * 3600 + (tz % 100) * 60;
if (s[0] == '+')
tz = -tz;
*
*/
-static RETSIGTYPE alrm_handler (int sig __attribute__((unused)))
+static void alrm_handler (int sig __attribute__((unused)))
{
/* empty */
}