From: "Dmitry V. Levin" <ldv@altlinux.org>
To: elfutils-devel@sourceware.org
Subject: [PATCH 1/2] Introduce xasprintf
Date: Mon, 6 Sep 2021 10:00:00 +0000 [thread overview]
Message-ID: <20210906100000.GA13778@altlinux.org> (raw)
Similar to other x* functions, xasprintf is like asprintf except that
it dies in case of an error.
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
lib/ChangeLog | 6 ++++++
lib/Makefile.am | 2 +-
lib/libeu.h | 2 ++
lib/xasprintf.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 61 insertions(+), 1 deletion(-)
create mode 100644 lib/xasprintf.c
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 60d32082..59d1d51c 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2021-09-06 Dmitry V. Levin <ldv@altlinux.org>
+
+ * xasprintf.c: New file.
+ * Makefile.am (libeu_a_SOURCES): Add it.
+ * libeu.h (xasprintf): New prototype.
+
2021-08-23 Saleem Abdulrasool <abdulras@google.com>
* system.h: Remove inline definition for error and error_message_count
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 766fbcd7..42ddf5ae 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -33,7 +33,7 @@ AM_CPPFLAGS += -I$(srcdir)/../libelf
noinst_LIBRARIES = libeu.a
-libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \
+libeu_a_SOURCES = xasprintf.c xstrdup.c xstrndup.c xmalloc.c next_prime.c \
crc32.c crc32_file.c \
color.c error.c printversion.c
diff --git a/lib/libeu.h b/lib/libeu.h
index ecb4d011..e849a79e 100644
--- a/lib/libeu.h
+++ b/lib/libeu.h
@@ -39,6 +39,8 @@ extern void *xrealloc (void *, size_t) __attribute__ ((__malloc__));
extern char *xstrdup (const char *) __attribute__ ((__malloc__));
extern char *xstrndup (const char *, size_t) __attribute__ ((__malloc__));
+extern char *xasprintf(const char *fmt, ...)
+ __attribute__ ((format (printf, 1, 2))) __attribute__ ((__malloc__));
extern uint32_t crc32 (uint32_t crc, unsigned char *buf, size_t len);
extern int crc32_file (int fd, uint32_t *resp);
diff --git a/lib/xasprintf.c b/lib/xasprintf.c
new file mode 100644
index 00000000..179ea2e8
--- /dev/null
+++ b/lib/xasprintf.c
@@ -0,0 +1,52 @@
+/* A wrapper around vasprintf that dies in case of an error.
+ Copyright (c) 2021 Dmitry V. Levin <ldv@altlinux.org>
+ This file is part of elfutils.
+
+ This file is free software; you can redistribute it and/or modify
+ it under the terms of either
+
+ * the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 3 of the License, or (at
+ your option) any later version
+
+ or
+
+ * the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at
+ your option) any later version
+
+ or both in parallel, as here.
+
+ elfutils is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received copies of the GNU General Public License and
+ the GNU Lesser General Public License along with this program. If
+ not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <libintl.h>
+#include "libeu.h"
+#include "system.h"
+
+char *
+xasprintf (const char *fmt, ...)
+{
+ char *res;
+ va_list ap;
+
+ va_start (ap, fmt);
+ if (unlikely (vasprintf (&res, fmt, ap) < 0))
+ error (EXIT_FAILURE, 0, _("memory exhausted"));
+ va_end(ap);
+
+ return res;
+}
--
ldv
next reply other threads:[~2021-09-06 10:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-06 10:00 Dmitry V. Levin [this message]
2021-09-06 10:00 ` [PATCH 2/2] Use xasprintf instead of asprintf followed by error(EXIT_FAILURE) Dmitry V. Levin
2021-09-08 22:19 ` Mark Wielaard
2021-09-08 22:14 ` [PATCH 1/2] Introduce xasprintf Mark Wielaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210906100000.GA13778@altlinux.org \
--to=ldv@altlinux.org \
--cc=elfutils-devel@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).