From: Austin Clements Date: Thu, 24 May 2012 19:32:02 +0000 (+2000) Subject: [PATCH v3 4/4] new: Unify add_files and add_files_recursive X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=17f4970731d6c0ac3445e51a36318c3184cc8dc9;p=notmuch-archives.git [PATCH v3 4/4] new: Unify add_files and add_files_recursive --- diff --git a/3e/e8a12fe98526f51863273b1cde6de5be2acd51 b/3e/e8a12fe98526f51863273b1cde6de5be2acd51 new file mode 100644 index 000000000..a83d13a39 --- /dev/null +++ b/3e/e8a12fe98526f51863273b1cde6de5be2acd51 @@ -0,0 +1,127 @@ +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 8D144431E82 + for ; Thu, 24 May 2012 12:32:09 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 71QeKjPngqmW for ; + Thu, 24 May 2012 12:32:08 -0700 (PDT) +Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU + [18.9.25.15]) + by olra.theworths.org (Postfix) with ESMTP id B4E98431FCF + for ; Thu, 24 May 2012 12:32:08 -0700 (PDT) +X-AuditID: 1209190f-b7f4f6d00000092b-a6-4fbe8cb82a3f +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP + id EC.22.02347.8BC8EBF4; Thu, 24 May 2012 15:32:08 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q4OJW7N6028224; + Thu, 24 May 2012 15:32:07 -0400 +Received: from drake.mit.edu (26-4-163.dynamic.csail.mit.edu [18.26.4.163]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4OJW5hI014462 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Thu, 24 May 2012 15:32:07 -0400 (EDT) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1SXdlT-0003Rf-UY; Thu, 24 May 2012 15:32:03 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v3 4/4] new: Unify add_files and add_files_recursive +Date: Thu, 24 May 2012 15:32:02 -0400 +Message-Id: <1337887922-13163-5-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1337887922-13163-1-git-send-email-amdragon@mit.edu> +References: <1336429240-1114-1-git-send-email-amdragon@mit.edu> + <1337887922-13163-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6norujZ5+/Qd8FYYvrN2cyOzB6PFt1 + izmAMYrLJiU1J7MstUjfLoEr48HmKawFT/gqbt6ey9bA+JS7i5GTQ0LAROL0it1MELaYxIV7 + 69m6GLk4hAT2MUo0zu5lAUkICWxglJhwyh0icZxJYt78U4wQzixGiW+HNzKDVLEJaEhs27+c + EcQWEZCW2Hl3NmsXIwcHs4CaxJ8uFZCwsICLxJy7P8CGsgioSjQ0HwOzeQUcJM5cP8AIcYW8 + xNP7fWwgNqeAo8SFJ5OZII4okzj+eBfTBEb+BYwMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3RN + 9HIzS/RSU0o3MYKChlOSfwfjt4NKhxgFOBiVeHhZo/f5C7EmlhVX5h5ilORgUhLl5esGCvEl + 5adUZiQWZ8QXleakFh9ilOBgVhLhFYwEyvGmJFZWpRblw6SkOViUxHlXa+72FxJITyxJzU5N + LUgtgsnKcHAoSfDaAKNDSLAoNT21Ii0zpwQhzcTBCTKcB2j4PpDFvMUFibnFmekQ+VOMilLi + vIIgzQIgiYzSPLheWFS/YhQHekWY1wKkigeYEOC6XwENZgIavOXxXpDBJYkIKakGRtMlygWz + +xX95jL4y1rtYtnskHr7UpO+bmrS2dhmK2n+M1/33Jsnzbz54tXC5gm2Ht8WqD0rzbD1Xbtu + d5hnaqNobqFVvEWRqdmbtwtjeqXbk1wmME0Lbnzum1evlyjj/7VeYZVijBNT0tEPPKd8Pyyp + 8G0TcPQUVpupqljk+uvzrW1zo92UWIozEg21mIuKEwHJfwqFxQIAAA== +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: Thu, 24 May 2012 19:32:09 -0000 + +Since starting at the top of a directory tree and recursing within +that tree are now identical operations, there's no need for both +add_files and add_files_recursive. This eliminates add_files (which +did nothing more than call add_files_recursive after the previous +patch) and renames add_files_recursive to add_files. +--- + notmuch-new.c | 18 ++++-------------- + 1 file changed, 4 insertions(+), 14 deletions(-) + +diff --git a/notmuch-new.c b/notmuch-new.c +index 2b05605..938ae29 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -281,9 +281,9 @@ _entry_in_ignore_list (const char *entry, add_files_state_t *state) + * if fs_mtime isn't the current wall-clock time. + */ + static notmuch_status_t +-add_files_recursive (notmuch_database_t *notmuch, +- const char *path, +- add_files_state_t *state) ++add_files (notmuch_database_t *notmuch, ++ const char *path, ++ add_files_state_t *state) + { + DIR *dir = NULL; + struct dirent *entry = NULL; +@@ -377,7 +377,7 @@ add_files_recursive (notmuch_database_t *notmuch, + } + + next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); +- status = add_files_recursive (notmuch, next, state); ++ status = add_files (notmuch, next, state); + if (status) { + ret = status; + goto DONE; +@@ -647,16 +647,6 @@ stop_progress_printing_timer (void) + } + + +-/* This is the top-level entry point for add_files. It does a couple +- * of error checks and then calls into the recursive function. */ +-static notmuch_status_t +-add_files (notmuch_database_t *notmuch, +- const char *path, +- add_files_state_t *state) +-{ +- return add_files_recursive (notmuch, path, state); +-} +- + /* XXX: This should be merged with the add_files function since it + * shares a lot of logic with it. */ + /* Recursively count all regular files in path and all sub-directories +-- +1.7.10 +