From 40021902131102d7d5da2f8910990d6ed13ae151 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Sun, 20 Jan 2013 11:49:51 +1100 Subject: [PATCH] [PATCH v3 07/20] tag-util: do not reset list in parse_tag_command_line --- f0/75f00709a508630e1104bf1cf7892b371f234d | 101 ++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 f0/75f00709a508630e1104bf1cf7892b371f234d diff --git a/f0/75f00709a508630e1104bf1cf7892b371f234d b/f0/75f00709a508630e1104bf1cf7892b371f234d new file mode 100644 index 000000000..bedc5174e --- /dev/null +++ b/f0/75f00709a508630e1104bf1cf7892b371f234d @@ -0,0 +1,101 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1F585429E3B + for ; Sat, 19 Jan 2013 16:51:14 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id cffW6XnSRCO4 for ; + Sat, 19 Jan 2013 16:51:13 -0800 (PST) +Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com + [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 3B457431FB6 + for ; Sat, 19 Jan 2013 16:51:08 -0800 (PST) +Received: by mail-pb0-f53.google.com with SMTP id un1so2034701pbc.26 + for ; Sat, 19 Jan 2013 16:51:07 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to + :references; bh=H3BnQLcp7qM6T9dqOdr88oaEu/h65qGdjaYrdCtUWYk=; + b=xBs7Ond/237gH9KVUlFxs/Md9nwWpF8d8TvhCUjS5mqF5U2vH45yLfCwA1gQJucFna + qnmZpEmHqXx+TG+iryvoeVx/ZvvXqkVW8R4iZ5obFdVHg0b7wymw1IOGouJ4wC9cYQ3Y + /pg6RLSvDT3VafvUQ5MoMFFjZBz9vxv+RgprBbMRJpVH6T9LCXO2gAkgvwXpU0cB54iF + POHAUNu/8AKxKjd9/Q2NQxM/YBpAvV6kbC1XPNLJ5jOH4ry5p0529GptsGwWbDkvCJWy + y/AhxR/5J4OEtlHBxAMNkOVQkexX0LlRey/xdhnZv52144Lpg3LUzYK6tv4hNiGvKIM7 + DjwA== +X-Received: by 10.68.242.134 with SMTP id wq6mr37229489pbc.146.1358643067269; + Sat, 19 Jan 2013 16:51:07 -0800 (PST) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPS id ir4sm5800545pbc.41.2013.01.19.16.51.05 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 19 Jan 2013 16:51:06 -0800 (PST) +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: [PATCH v3 07/20] tag-util: do not reset list in + parse_tag_command_line +Date: Sun, 20 Jan 2013 11:49:51 +1100 +Message-Id: <1358643004-14522-8-git-send-email-novalazy@gmail.com> +X-Mailer: git-send-email 1.7.12.1 +In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com> +References: <1358643004-14522-1-git-send-email-novalazy@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 20 Jan 2013 00:51:15 -0000 + +No current callers of parse_tag_command_line require that it clear its +tag list argument. The notmuch 'insert' command will be better served +if the function modifies a pre-populated list (of new.tags) instead of +clobbering it outright. +--- + tag-util.c | 2 -- + tag-util.h | 2 ++ + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tag-util.c b/tag-util.c +index 701d329..3f9da05 100644 +--- a/tag-util.c ++++ b/tag-util.c +@@ -165,8 +165,6 @@ parse_tag_command_line (void *ctx, int argc, char **argv, + + int i; + +- tag_op_list_reset (tag_ops); +- + for (i = 0; i < argc; i++) { + if (strcmp (argv[i], "--") == 0) { + i++; +diff --git a/tag-util.h b/tag-util.h +index 246de85..4628f16 100644 +--- a/tag-util.h ++++ b/tag-util.h +@@ -81,6 +81,8 @@ parse_tag_line (void *ctx, char *line, + * Output Parameters: + * ops contains a list of tag operations + * query_str the search terms. ++ * ++ * The ops argument is not cleared. + */ + + tag_parse_status_t +-- +1.7.12.1 + -- 2.26.2