From f4c7e60e8c4aa2b7847e756737a892070a40a3b8 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Thu, 20 Dec 2012 17:42:39 +0200 Subject: [PATCH] Re: [PATCH 2/3] util: add xtalloc.[ch] --- 0f/ae02132fca184c5f745276d18c87a4dbaa02a8 | 154 ++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 0f/ae02132fca184c5f745276d18c87a4dbaa02a8 diff --git a/0f/ae02132fca184c5f745276d18c87a4dbaa02a8 b/0f/ae02132fca184c5f745276d18c87a4dbaa02a8 new file mode 100644 index 000000000..24a7010bf --- /dev/null +++ b/0f/ae02132fca184c5f745276d18c87a4dbaa02a8 @@ -0,0 +1,154 @@ +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 DC61F431FAF + for ; Thu, 20 Dec 2012 07:42:45 -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 t4E-OUV1qtVV for ; + Thu, 20 Dec 2012 07:42:45 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 1AF64431FAE + for ; Thu, 20 Dec 2012 07:42:45 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id C6A85100094; + Thu, 20 Dec 2012 17:42:39 +0200 (EET) +From: Tomi Ollila +To: david@tethera.net, notmuch@notmuchmail.org +Subject: Re: [PATCH 2/3] util: add xtalloc.[ch] +In-Reply-To: <1355714648-23144-3-git-send-email-david@tethera.net> +References: <1355714648-23144-1-git-send-email-david@tethera.net> + <1355714648-23144-3-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.14+211~g71b47e9 (http://notmuchmail.org) Emacs/24.2.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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: Thu, 20 Dec 2012 15:42:46 -0000 + +On Mon, Dec 17 2012, david@tethera.net wrote: + +> From: David Bremner +> +> These are intended to be simple wrappers to provide slightly better +> debugging information than what talloc currently provides natively. +> --- + +AFAIC it's been customary to have memory allocation functions starting +with 'x' to abort execution if memory allocation fails. See util/xutil.c +in notmuch source for reference. IMHO it would be confusing to use +the 'x' prefix for some other use. + +Tomi + + +> 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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2