changeset: 6308:132861c8b4e9
user: Aaron Schrab <aaron+m...@schrab.com>
date: Sat Oct 05 19:25:00 2013 +0000
link: http://dev.mutt.org/hg/mutt/rev/132861c8b4e9
Consistently use mutt_buffer_init function
Despite the existence of the mutt_buffer_init function, most
initializations were instead done with memset. Use the specific
function instead to make it easier if later changes are made to how the
initialization should be done.
diffs (295 lines):
diff -r 0beba37c336b -r 132861c8b4e9 commands.c
--- a/commands.c Fri Oct 04 16:47:59 2013 +0000
+++ b/commands.c Sat Oct 05 19:25:00 2013 +0000
@@ -619,7 +619,7 @@
return;
err.dsize = STRING;
err.data = safe_malloc(err.dsize);
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
r = mutt_parse_rc_line (buffer, &token, &err);
FREE (&token.data);
if (err.data[0])
diff -r 0beba37c336b -r 132861c8b4e9 hook.c
--- a/hook.c Fri Oct 04 16:47:59 2013 +0000
+++ b/hook.c Sat Oct 05 19:25:00 2013 +0000
@@ -52,8 +52,8 @@
pattern_t *pat = NULL;
char path[_POSIX_PATH_MAX];
- memset (&pattern, 0, sizeof (pattern));
- memset (&command, 0, sizeof (command));
+ mutt_buffer_init (&pattern);
+ mutt_buffer_init (&command);
if (*s->dptr == '!')
{
@@ -284,7 +284,7 @@
err.dsize = STRING;
err.data = safe_malloc (err.dsize);
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
for (; tmp; tmp = tmp->next)
{
if(!tmp->command)
@@ -335,7 +335,7 @@
err.dsize = STRING;
err.data = safe_malloc (err.dsize);
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
for (hook = Hooks; hook; hook = hook->next)
{
if(!hook->command)
@@ -478,7 +478,7 @@
err.dsize = STRING;
err.data = safe_malloc (err.dsize);
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
for (hook = Hooks; hook; hook = hook->next)
{
diff -r 0beba37c336b -r 132861c8b4e9 imap/command.c
--- a/imap/command.c Fri Oct 04 16:47:59 2013 +0000
+++ b/imap/command.c Sat Oct 05 19:25:00 2013 +0000
@@ -777,7 +777,7 @@
url.user = NULL;
url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
safe_strcat (buf, sizeof (buf), "\"");
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
err.data = errstr;
err.dsize = sizeof (errstr);
if (mutt_parse_rc_line (buf, &token, &err))
diff -r 0beba37c336b -r 132861c8b4e9 imap/imap.c
--- a/imap/imap.c Fri Oct 04 16:47:59 2013 +0000
+++ b/imap/imap.c Sat Oct 05 19:25:00 2013 +0000
@@ -1787,7 +1787,7 @@
if (!do_search (pat, 1))
return 0;
- memset (&buf, 0, sizeof (buf));
+ mutt_buffer_init (&buf);
mutt_buffer_addstr (&buf, "UID SEARCH ");
if (imap_compile_search (pat, &buf) < 0)
{
@@ -1827,7 +1827,7 @@
if (option (OPTIMAPCHECKSUBSCRIBED))
{
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
err.data = errstr;
err.dsize = sizeof (errstr);
snprintf (mbox, sizeof (mbox), "%smailboxes \"%s\"",
diff -r 0beba37c336b -r 132861c8b4e9 imap/message.c
--- a/imap/message.c Fri Oct 04 16:47:59 2013 +0000
+++ b/imap/message.c Sat Oct 05 19:25:00 2013 +0000
@@ -770,8 +770,8 @@
/* loop in case of TRYCREATE */
do
{
- memset (&sync_cmd, 0, sizeof (sync_cmd));
- memset (&cmd, 0, sizeof (cmd));
+ mutt_buffer_init (&sync_cmd);
+ mutt_buffer_init (&cmd);
/* Null HEADER* means copy tagged messages */
if (!h)
diff -r 0beba37c336b -r 132861c8b4e9 init.c
--- a/init.c Fri Oct 04 16:47:59 2013 +0000
+++ b/init.c Sat Oct 05 19:25:00 2013 +0000
@@ -254,7 +254,7 @@
tok->dptr = pc + 1;
/* read line */
- memset (&expn, 0, sizeof (expn));
+ mutt_buffer_init (&expn);
expn.data = mutt_read_line (NULL, &expn.dsize, fp, &line, 0);
safe_fclose (&fp);
mutt_wait_filter (pid);
@@ -706,7 +706,7 @@
{
BUFFER templ;
- memset(&templ, 0, sizeof(templ));
+ mutt_buffer_init (&templ);
/* Insist on at least one parameter */
if (!MoreArgs(s))
@@ -1444,7 +1444,7 @@
/* replace the old value */
FREE (&tmp->data);
tmp->data = buf->data;
- memset (buf, 0, sizeof (BUFFER));
+ mutt_buffer_init (buf);
return 0;
}
if (!tmp->next)
@@ -1459,7 +1459,7 @@
UserHeader = tmp;
}
tmp->data = buf->data;
- memset (buf, 0, sizeof (BUFFER));
+ mutt_buffer_init (buf);
return 0;
}
@@ -2254,7 +2254,7 @@
return (-1);
}
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
while ((linebuf = mutt_read_line (linebuf, &buflen, f, &line, M_CONT)) !=
NULL)
{
conv=ConfigCharset && (*ConfigCharset) && Charset;
@@ -2338,7 +2338,7 @@
if (!line || !*line)
return 0;
- memset (&expn, 0, sizeof (expn));
+ mutt_buffer_init (&expn);
expn.data = expn.dptr = line;
expn.dsize = mutt_strlen (line);
@@ -2734,10 +2734,10 @@
char command[STRING];
BUFFER err, token;
-
- memset (&err, 0, sizeof (err));
- memset (&token, 0, sizeof (token));
-
+
+ mutt_buffer_init (&err);
+ mutt_buffer_init (&token);
+
err.dsize = STRING;
err.data = safe_malloc (err.dsize);
@@ -2769,10 +2769,10 @@
char command[STRING];
BUFFER err, token;
-
- memset (&err, 0, sizeof (err));
- memset (&token, 0, sizeof (token));
-
+
+ mutt_buffer_init (&err);
+ mutt_buffer_init (&token);
+
err.dsize = STRING;
err.data = safe_malloc (err.dsize);
@@ -2848,10 +2848,10 @@
{
BUFFER err, token;
- memset (&err, 0, sizeof (err));
+ mutt_buffer_init (&err);
err.dsize = STRING;
err.data = safe_malloc (err.dsize);
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
for (; p; p = p->next)
{
if (mutt_parse_rc_line (p->data, &token, &err) != 0)
@@ -2894,7 +2894,7 @@
int i, default_rc = 0, need_pause = 0;
BUFFER err;
- memset (&err, 0, sizeof (err));
+ mutt_buffer_init (&err);
err.dsize = STRING;
err.data = safe_malloc(err.dsize);
err.dptr = err.data;
@@ -3020,11 +3020,11 @@
snprintf (buffer, sizeof (buffer), "Reply-To: %s", p);
- memset (&buf, 0, sizeof (buf));
+ mutt_buffer_init (&buf);
buf.data = buf.dptr = buffer;
buf.dsize = mutt_strlen (buffer);
- memset (&token, 0, sizeof (token));
+ mutt_buffer_init (&token);
parse_my_hdr (&token, &buf, 0, &err);
FREE (&token.data);
}
diff -r 0beba37c336b -r 132861c8b4e9 keymap.c
--- a/keymap.c Fri Oct 04 16:47:59 2013 +0000
+++ b/keymap.c Sat Oct 05 19:25:00 2013 +0000
@@ -866,7 +866,7 @@
int i=0;
char *p, *q;
- memset (&buf, 0, sizeof (buf));
+ mutt_buffer_init (&buf);
/* menu name */
mutt_extract_token (&buf, s, 0);
diff -r 0beba37c336b -r 132861c8b4e9 pattern.c
--- a/pattern.c Fri Oct 04 16:47:59 2013 +0000
+++ b/pattern.c Sat Oct 05 19:25:00 2013 +0000
@@ -257,7 +257,7 @@
char errmsg[STRING];
int r;
- memset (&buf, 0, sizeof (buf));
+ mutt_buffer_init (&buf);
if (mutt_extract_token (&buf, s, M_TOKEN_PATTERN | M_TOKEN_COMMENT) != 0 ||
!buf.data)
{
@@ -575,7 +575,7 @@
BUFFER buffer;
struct tm min, max;
- memset (&buffer, 0, sizeof (buffer));
+ mutt_buffer_init (&buffer);
if (mutt_extract_token (&buffer, s, M_TOKEN_COMMENT | M_TOKEN_PATTERN) != 0
|| !buffer.data)
{
@@ -779,7 +779,7 @@
char *buf;
BUFFER ps;
- memset (&ps, 0, sizeof (ps));
+ mutt_buffer_init (&ps);
ps.dptr = s;
ps.dsize = mutt_strlen (s);
@@ -1302,7 +1302,7 @@
simple = safe_strdup (buf);
mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
- memset (&err, 0, sizeof(err));
+ mutt_buffer_init (&err);
err.dsize = STRING;
err.data = safe_malloc(err.dsize);
if ((pat = mutt_pattern_comp (buf, M_FULL_MSG, &err)) == NULL)
@@ -1434,7 +1434,7 @@
if (!SearchPattern || mutt_strcmp (temp, LastSearchExpn))
{
BUFFER err;
- memset(&err, 0, sizeof(err));
+ mutt_buffer_init (&err);
set_option (OPTSEARCHINVALID);
strfcpy (LastSearch, buf, sizeof (LastSearch));
mutt_message _("Compiling search pattern...");
diff -r 0beba37c336b -r 132861c8b4e9 score.c
--- a/score.c Fri Oct 04 16:47:59 2013 +0000
+++ b/score.c Sat Oct 05 19:25:00 2013 +0000
@@ -76,7 +76,7 @@
return (-1);
}
pattern = buf->data;
- memset (buf, 0, sizeof (BUFFER));
+ mutt_buffer_init (buf);
mutt_extract_token (buf, s, 0);
if (MoreArgs (s))
{
