From 049742daef2e31e791ee3497a8060a082997e566 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 13 Mar 2005 19:55:38 +0000 Subject: [PATCH] * cp-abi.c (set_cp_abi_as_auto_default): Use xasprintf instead of a combination of xmalloc and sprintf. --- gdb/ChangeLog | 5 +++++ gdb/cp-abi.c | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9ef6f89e4c..eef6995561 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2005-03-13 Mark Kettenis + + * cp-abi.c (set_cp_abi_as_auto_default): Use xasprintf instead of + a combination of xmalloc and sprintf. + 2005-03-13 Jim Blandy * configure.ac: Use '=', not '=='; the latter is a GNU extension. diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index 2b39300e4d..f507785656 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -145,14 +145,11 @@ set_cp_abi_as_auto_default (const char *short_name) auto_cp_abi = *abi; auto_cp_abi.shortname = "auto"; - new_longname = xmalloc (strlen ("currently ") + 1 + strlen (abi->shortname) - + 1 + 1); - sprintf (new_longname, "currently \"%s\"", abi->shortname); + xasprintf (&new_longname, "currently \"%s\"", abi->shortname); auto_cp_abi.longname = new_longname; - new_doc = xmalloc (strlen ("Automatically selected; currently ") - + 1 + strlen (abi->shortname) + 1 + 1); - sprintf (new_doc, "Automatically selected; currently \"%s\"", abi->shortname); + xasprintf (&new_doc, "Automatically selected; currently \"%s\"", + abi->shortname); auto_cp_abi.doc = new_doc; /* Since we copy the current ABI into current_cp_abi instead of