1 Return-Path: <amdragon@mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 8D144431E82
\r
6 for <notmuch@notmuchmail.org>; Thu, 24 May 2012 12:32:09 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 71QeKjPngqmW for <notmuch@notmuchmail.org>;
\r
16 Thu, 24 May 2012 12:32:08 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id B4E98431FCF
\r
20 for <notmuch@notmuchmail.org>; Thu, 24 May 2012 12:32:08 -0700 (PDT)
\r
21 X-AuditID: 1209190f-b7f4f6d00000092b-a6-4fbe8cb82a3f
\r
22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
\r
23 by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id EC.22.02347.8BC8EBF4; Thu, 24 May 2012 15:32:08 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q4OJW7N6028224;
\r
27 Thu, 24 May 2012 15:32:07 -0400
\r
28 Received: from drake.mit.edu (26-4-163.dynamic.csail.mit.edu [18.26.4.163])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4OJW5hI014462
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Thu, 24 May 2012 15:32:07 -0400 (EDT)
\r
34 Received: from amthrax by drake.mit.edu with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1SXdlT-0003Rf-UY; Thu, 24 May 2012 15:32:03 -0400
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH v3 4/4] new: Unify add_files and add_files_recursive
\r
40 Date: Thu, 24 May 2012 15:32:02 -0400
\r
41 Message-Id: <1337887922-13163-5-git-send-email-amdragon@mit.edu>
\r
42 X-Mailer: git-send-email 1.7.10
\r
43 In-Reply-To: <1337887922-13163-1-git-send-email-amdragon@mit.edu>
\r
44 References: <1336429240-1114-1-git-send-email-amdragon@mit.edu>
\r
45 <1337887922-13163-1-git-send-email-amdragon@mit.edu>
\r
46 X-Brightmail-Tracker:
\r
47 H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6norujZ5+/Qd8FYYvrN2cyOzB6PFt1
\r
48 izmAMYrLJiU1J7MstUjfLoEr48HmKawFT/gqbt6ey9bA+JS7i5GTQ0LAROL0it1MELaYxIV7
\r
49 69m6GLk4hAT2MUo0zu5lAUkICWxglJhwyh0icZxJYt78U4wQzixGiW+HNzKDVLEJaEhs27+c
\r
50 EcQWEZCW2Hl3NmsXIwcHs4CaxJ8uFZCwsICLxJy7P8CGsgioSjQ0HwOzeQUcJM5cP8AIcYW8
\r
51 xNP7fWwgNqeAo8SFJ5OZII4okzj+eBfTBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3RN
\r
52 9HIzS/RSU0o3MYKChlOSfwfjt4NKhxgFOBiVeHhZo/f5C7EmlhVX5h5ilORgUhLl5esGCvEl
\r
53 5adUZiQWZ8QXleakFh9ilOBgVhLhFYwEyvGmJFZWpRblw6SkOViUxHlXa+72FxJITyxJzU5N
\r
54 LUgtgsnKcHAoSfDaAKNDSLAoNT21Ii0zpwQhzcTBCTKcB2j4PpDFvMUFibnFmekQ+VOMilLi
\r
55 vIIgzQIgiYzSPLheWFS/YhQHekWY1wKkigeYEOC6XwENZgIavOXxXpDBJYkIKakGRtMlygWz
\r
56 +xX95jL4y1rtYtnskHr7UpO+bmrS2dhmK2n+M1/33Jsnzbz54tXC5gm2Ht8WqD0rzbD1Xbtu
\r
57 d5hnaqNobqFVvEWRqdmbtwtjeqXbk1wmME0Lbnzum1evlyjj/7VeYZVijBNT0tEPPKd8Pyyp
\r
58 8G0TcPQUVpupqljk+uvzrW1zo92UWIozEg21mIuKEwHJfwqFxQIAAA==
\r
59 X-BeenThere: notmuch@notmuchmail.org
\r
60 X-Mailman-Version: 2.1.13
\r
62 List-Id: "Use and development of the notmuch mail system."
\r
63 <notmuch.notmuchmail.org>
\r
64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
67 List-Post: <mailto:notmuch@notmuchmail.org>
\r
68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
71 X-List-Received-Date: Thu, 24 May 2012 19:32:09 -0000
\r
73 Since starting at the top of a directory tree and recursing within
\r
74 that tree are now identical operations, there's no need for both
\r
75 add_files and add_files_recursive. This eliminates add_files (which
\r
76 did nothing more than call add_files_recursive after the previous
\r
77 patch) and renames add_files_recursive to add_files.
\r
79 notmuch-new.c | 18 ++++--------------
\r
80 1 file changed, 4 insertions(+), 14 deletions(-)
\r
82 diff --git a/notmuch-new.c b/notmuch-new.c
\r
83 index 2b05605..938ae29 100644
\r
86 @@ -281,9 +281,9 @@ _entry_in_ignore_list (const char *entry, add_files_state_t *state)
\r
87 * if fs_mtime isn't the current wall-clock time.
\r
89 static notmuch_status_t
\r
90 -add_files_recursive (notmuch_database_t *notmuch,
\r
92 - add_files_state_t *state)
\r
93 +add_files (notmuch_database_t *notmuch,
\r
95 + add_files_state_t *state)
\r
98 struct dirent *entry = NULL;
\r
99 @@ -377,7 +377,7 @@ add_files_recursive (notmuch_database_t *notmuch,
\r
102 next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
\r
103 - status = add_files_recursive (notmuch, next, state);
\r
104 + status = add_files (notmuch, next, state);
\r
108 @@ -647,16 +647,6 @@ stop_progress_printing_timer (void)
\r
112 -/* This is the top-level entry point for add_files. It does a couple
\r
113 - * of error checks and then calls into the recursive function. */
\r
114 -static notmuch_status_t
\r
115 -add_files (notmuch_database_t *notmuch,
\r
116 - const char *path,
\r
117 - add_files_state_t *state)
\r
119 - return add_files_recursive (notmuch, path, state);
\r
122 /* XXX: This should be merged with the add_files function since it
\r
123 * shares a lot of logic with it. */
\r
124 /* Recursively count all regular files in path and all sub-directories
\r