This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU Mailutils".
http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=3b0dfa604bc0ff846020adefd7252dc7e27cadad The branch, master has been updated via 3b0dfa604bc0ff846020adefd7252dc7e27cadad (commit) from fb8195c07ba6c6a3afa7da1f028410723e9073a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3b0dfa604bc0ff846020adefd7252dc7e27cadad Author: Sergey Poznyakoff <g...@gnu.org.ua> Date: Tue Dec 20 11:10:04 2016 +0200 Bugfixes * libmu_sieve/sieve.y (mu_sieve_machine_clone): Fix memory allocation. * mh/pick.c: Remove unused functions. ----------------------------------------------------------------------- Summary of changes: libmu_sieve/sieve.y | 6 +++--- mh/pick.c | 33 ++------------------------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/libmu_sieve/sieve.y b/libmu_sieve/sieve.y index 9c3341a..edd4c37 100644 --- a/libmu_sieve/sieve.y +++ b/libmu_sieve/sieve.y @@ -1137,19 +1137,19 @@ mu_sieve_machine_clone (mu_sieve_machine_t const parent, } /* Copy value space */ - child->valspace = mu_sieve_calloc (parent, parent->valcount, + child->valspace = mu_sieve_calloc (child, parent->valcount, sizeof child->valspace[0]); child->valcount = child->valmax = parent->valcount; for (i = 0; i < child->valcount; i++) { child->valspace[i].type = parent->valspace[i].type; child->valspace[i].tag = - mu_sieve_strdup (parent, parent->valspace[i].tag); + mu_sieve_strdup (child, parent->valspace[i].tag); switch (child->valspace[i].type) { case SVT_TAG: child->valspace[i].v.string = - mu_sieve_strdup (parent, parent->valspace[i].v.string); + mu_sieve_strdup (child, parent->valspace[i].v.string); break; default: diff --git a/mh/pick.c b/mh/pick.c index 37fa0da..3524f24 100644 --- a/mh/pick.c +++ b/mh/pick.c @@ -232,34 +232,6 @@ action_add (void *item, void *data) return 0; } -static void -parse_comp_match (int *pargc, char **argv) -{ - int i, j; - int argc = *pargc; - - for (i = j = 0; i < argc; i++) - { - if (strncmp (argv[i], "--", 2) == 0) - { - if (++i < argc) - { - pick_add_token (&lexlist, T_COMP, argv[i-1] + 2); - pick_add_token (&lexlist, T_STRING, argv[i]); - } - else - { - mu_error (_("%s: must be followed by a pattern"), argv[i-1]); - exit (1); - } - } - else - argv[j++] = argv[i]; - } - argv[j] = NULL; - *pargc = j; -} - int main (int argc, char **argv) { @@ -267,7 +239,8 @@ main (int argc, char **argv) mu_mailbox_t mbox; mu_msgset_t msgset; int argv_alloc = 0; - + + /* Expand eventual --COMPONENT NAME pairs */ for (i = 1; i < argc;) { if (strncmp (argv[i], "--", 2) == 0 && argv[i][3] && i + 1 < argc) @@ -299,8 +272,6 @@ main (int argc, char **argv) mh_getopt (&argc, &argv, options, MH_GETOPT_DEFAULT_FOLDER, args_doc, prog_doc, NULL); - parse_comp_match (&argc, argv); - if (pick_parse (lexlist)) return 1; hooks/post-receive -- GNU Mailutils _______________________________________________ Commit-mailutils mailing list Commit-mailutils@gnu.org https://lists.gnu.org/mailman/listinfo/commit-mailutils
