From b53b306a6526d8cd0796e6064639744c2e2d25d2 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 17 Dec 2012 23:24:06 +2000 Subject: [PATCH] [PATCH 2/3] util: add xtalloc.[ch] --- 1c/3ac34e70296b71670137720280fa8a48f2d1e7 | 141 ++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 1c/3ac34e70296b71670137720280fa8a48f2d1e7 diff --git a/1c/3ac34e70296b71670137720280fa8a48f2d1e7 b/1c/3ac34e70296b71670137720280fa8a48f2d1e7 new file mode 100644 index 000000000..e2a1baec2 --- /dev/null +++ b/1c/3ac34e70296b71670137720280fa8a48f2d1e7 @@ -0,0 +1,141 @@ +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 D1F23431FC2 + for ; Sun, 16 Dec 2012 19:24:29 -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 NJSJICkb0zdg for ; + Sun, 16 Dec 2012 19:24:28 -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 413FA431E62 + for ; Sun, 16 Dec 2012 19:24:26 -0800 (PST) +Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net + ([142.167.90.129] 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 1TkRJZ-0008Jl-AJ; Sun, 16 Dec 2012 23:24:25 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1TkRJT-00063P-OV; Sun, 16 Dec 2012 23:24:19 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] util: add xtalloc.[ch] +Date: Sun, 16 Dec 2012 23:24:06 -0400 +Message-Id: <1355714648-23144-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1355714648-23144-1-git-send-email-david@tethera.net> +References: <1355714648-23144-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: Mon, 17 Dec 2012 03:24:30 -0000 + +From: David Bremner + +These are intended to be simple wrappers to provide slightly better +debugging information than what talloc currently provides natively. +--- + notmuch-client.h | 2 +- + util/Makefile.local | 2 +- + util/xtalloc.c | 15 +++++++++++++++ + util/xtalloc.h | 18 ++++++++++++++++++ + 4 files changed, 35 insertions(+), 2 deletions(-) + create mode 100644 util/xtalloc.c + create mode 100644 util/xtalloc.h + +diff --git a/notmuch-client.h b/notmuch-client.h +index d7b352e..60be030 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -58,7 +58,7 @@ typedef GMimeCipherContext notmuch_crypto_context_t; + #include + #include + +-#include ++#include "xtalloc.h" + + #define unused(x) x __attribute__ ((unused)) + +diff --git a/util/Makefile.local b/util/Makefile.local +index a11e35b..8a62c00 100644 +--- a/util/Makefile.local ++++ b/util/Makefile.local +@@ -4,7 +4,7 @@ dir := util + extra_cflags += -I$(srcdir)/$(dir) + + libutil_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c \ +- $(dir)/string-util.c ++ $(dir)/string-util.c $(dir)/xtalloc.c + + libutil_modules := $(libutil_c_srcs:.c=.o) + +diff --git a/util/xtalloc.c b/util/xtalloc.c +new file mode 100644 +index 0000000..22834bd +--- /dev/null ++++ b/util/xtalloc.c +@@ -0,0 +1,15 @@ ++#include ++#include "xtalloc.h" ++ ++char * ++xtalloc_strndup_named_const (void *ctx, const char *str, ++ size_t len, const char *name) ++{ ++ char *ptr = talloc_named_const (ctx, len + 1, name); ++ ++ if (ptr) { ++ memcpy (ptr, str, len); ++ *(ptr + len) = '\0'; ++ } ++ return ptr; ++} +diff --git a/util/xtalloc.h b/util/xtalloc.h +new file mode 100644 +index 0000000..3cc1179 +--- /dev/null ++++ b/util/xtalloc.h +@@ -0,0 +1,18 @@ ++#ifndef _XTALLOC_H ++#define _XTALLOC_H ++ ++#include ++ ++/* Like talloc_strndup, but take an extra parameter for the internal talloc ++ * name (for debugging) */ ++ ++char * ++xtalloc_strndup_named_const (void *ctx, const char *str, ++ size_t len, const char *name); ++ ++/* use the __location__ macro from talloc.h to name a string according to its ++ * source location */ ++ ++#define xtalloc_strndup(ctx, str, len) xtalloc_strndup_named_const (ctx, str, len, __location__) ++ ++#endif +-- +1.7.10.4 + -- 2.26.2