From: david Date: Wed, 26 Dec 2012 21:58:30 +0000 (+2000) Subject: [Patch v2 3/4] notmuch-restore: use debug version of talloc_strndup X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=38cbbbde3a88bc8da52ef29d77169b1299db0122;p=notmuch-archives.git [Patch v2 3/4] notmuch-restore: use debug version of talloc_strndup --- diff --git a/34/48cf9c37095fa5f667b18e69de9c2c196e9496 b/34/48cf9c37095fa5f667b18e69de9c2c196e9496 new file mode 100644 index 000000000..d40bee71d --- /dev/null +++ b/34/48cf9c37095fa5f667b18e69de9c2c196e9496 @@ -0,0 +1,84 @@ +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 65CF2431FB6 + for ; Wed, 26 Dec 2012 13:58:57 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 9VtAy7C0yv2y for ; + Wed, 26 Dec 2012 13:58:52 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 29169431E62 + for ; Wed, 26 Dec 2012 13:58:49 -0800 (PST) +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1Tnyzw-0002wi-88; Wed, 26 Dec 2012 17:58:48 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1Tnyzq-0002Xy-Nu; Wed, 26 Dec 2012 17:58:42 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v2 3/4] notmuch-restore: use debug version of talloc_strndup +Date: Wed, 26 Dec 2012 17:58:30 -0400 +Message-Id: <1356559111-9447-4-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1356559111-9447-1-git-send-email-david@tethera.net> +References: <1356559111-9447-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +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: Wed, 26 Dec 2012 21:58:57 -0000 + +From: David Bremner + +This gives line numbers for better debugging. +--- + notmuch-restore.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/notmuch-restore.c b/notmuch-restore.c +index c93f1ac..6111977 100644 +--- a/notmuch-restore.c ++++ b/notmuch-restore.c +@@ -88,10 +88,11 @@ parse_sup_line (void *ctx, char *line, + return 1; + } + +- *query_str = talloc_strndup (ctx, line + match[1].rm_so, +- match[1].rm_eo - match[1].rm_so); +- file_tags = talloc_strndup (ctx, line + match[2].rm_so, +- match[2].rm_eo - match[2].rm_so); ++ *query_str = talloc_strndup_debug (ctx, line + match[1].rm_so, ++ match[1].rm_eo - match[1].rm_so); ++ ++ file_tags = talloc_strndup_debug (ctx, line + match[2].rm_so, ++ match[2].rm_eo - match[2].rm_so); + + char *tok = file_tags; + size_t tok_len = 0; +-- +1.7.10.4 +