mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-08-26 15:22:25 +08:00
Introduce string_vprintf
This adds string_vprintf, a va_list variant of string_printf. This will be used in later patches. gdb/ChangeLog 2017-09-29 Tom Tromey <tom@tromey.com> * unittests/common-utils-selftests.c (format): New function. (string_vprintf_tests): New function. (_initialize_common_utils_selftests): Register new tests. * common/common-utils.c (string_vprintf): New function. * common/common-utils.h (string_vprintf): Declare.
This commit is contained in:
@ -1,3 +1,11 @@
|
|||||||
|
2017-09-29 Tom Tromey <tom@tromey.com>
|
||||||
|
|
||||||
|
* unittests/common-utils-selftests.c (format): New function.
|
||||||
|
(string_vprintf_tests): New function.
|
||||||
|
(_initialize_common_utils_selftests): Register new tests.
|
||||||
|
* common/common-utils.c (string_vprintf): New function.
|
||||||
|
* common/common-utils.h (string_vprintf): Declare.
|
||||||
|
|
||||||
2017-09-29 Pedro Alves <palves@redhat.com>
|
2017-09-29 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
* common/rsp-low.c (unpack_varlen_hex): Constify.
|
* common/rsp-low.c (unpack_varlen_hex): Constify.
|
||||||
|
@ -174,6 +174,27 @@ string_printf (const char* fmt, ...)
|
|||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* See documentation in common-utils.h. */
|
||||||
|
|
||||||
|
std::string
|
||||||
|
string_vprintf (const char* fmt, va_list args)
|
||||||
|
{
|
||||||
|
va_list vp;
|
||||||
|
size_t size;
|
||||||
|
|
||||||
|
va_copy (vp, args);
|
||||||
|
size = vsnprintf (NULL, 0, fmt, vp);
|
||||||
|
va_end (vp);
|
||||||
|
|
||||||
|
std::string str (size, '\0');
|
||||||
|
|
||||||
|
/* C++11 and later guarantee std::string uses contiguous memory and
|
||||||
|
always includes the terminating '\0'. */
|
||||||
|
vsprintf (&str[0], fmt, args);
|
||||||
|
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
savestring (const char *ptr, size_t len)
|
savestring (const char *ptr, size_t len)
|
||||||
{
|
{
|
||||||
|
@ -63,6 +63,10 @@ int xsnprintf (char *str, size_t size, const char *format, ...)
|
|||||||
std::string string_printf (const char* fmt, ...)
|
std::string string_printf (const char* fmt, ...)
|
||||||
ATTRIBUTE_PRINTF (1, 2);
|
ATTRIBUTE_PRINTF (1, 2);
|
||||||
|
|
||||||
|
/* Like string_printf, but takes a va_list. */
|
||||||
|
std::string string_vprintf (const char* fmt, va_list args)
|
||||||
|
ATTRIBUTE_PRINTF (1, 0);
|
||||||
|
|
||||||
/* Make a copy of the string at PTR with LEN characters
|
/* Make a copy of the string at PTR with LEN characters
|
||||||
(and add a null character at the end in the copy).
|
(and add a null character at the end in the copy).
|
||||||
Uses malloc to get the space. Returns the address of the copy. */
|
Uses malloc to get the space. Returns the address of the copy. */
|
||||||
|
@ -41,10 +41,33 @@ string_printf_tests ()
|
|||||||
SELF_CHECK (string_printf ("%s", X100000) == X100000);
|
SELF_CHECK (string_printf ("%s", X100000) == X100000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static std::string
|
||||||
|
format (const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list vp;
|
||||||
|
|
||||||
|
va_start (vp, fmt);
|
||||||
|
std::string result = string_vprintf (fmt, vp);
|
||||||
|
va_end (vp);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
string_vprintf_tests ()
|
||||||
|
{
|
||||||
|
/* Basic smoke tests. */
|
||||||
|
SELF_CHECK (format ("%s", "test") == "test");
|
||||||
|
SELF_CHECK (format ("%d", 23) == "23");
|
||||||
|
SELF_CHECK (format ("%s %d %s", "test", 23, "done")
|
||||||
|
== "test 23 done");
|
||||||
|
SELF_CHECK (format ("nothing") == "nothing");
|
||||||
|
}
|
||||||
|
|
||||||
} /* namespace selftests */
|
} /* namespace selftests */
|
||||||
|
|
||||||
void
|
void
|
||||||
_initialize_common_utils_selftests ()
|
_initialize_common_utils_selftests ()
|
||||||
{
|
{
|
||||||
selftests::register_test ("string_printf", selftests::string_printf_tests);
|
selftests::register_test ("string_printf", selftests::string_printf_tests);
|
||||||
|
selftests::register_test ("string_vprintf", selftests::string_vprintf_tests);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user