From 57c3b6ede58a103b97baa10bef7d9d9031d2269b Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 14 Feb 2013 17:09:00 +0000 Subject: [PATCH] savestring: Rename parameter 'size' to 'len'. It's better to avoid needless confusion, and call string length, length, instead of size, which is usually used to refer to sizeof of the string (len+1): size_t len = strlen (str); size_t size = sizeof (str); Tested on x86_64 Fedora 17. 2013-02-14 Pedro Alves * utils.c (savestring): Rename parameter 'size' to 'len'. --- gdb/ChangeLog | 4 ++++ gdb/utils.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9523824442a..3e91b36bc01 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2013-02-14 Pedro Alves + + * utils.c (savestring): Rename parameter 'size' to 'len'. + 2013-02-14 Pedro Alves Yufeng Zhang diff --git a/gdb/utils.c b/gdb/utils.c index 282ab8b9b0e..408c6ce0888 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1186,17 +1186,17 @@ myread (int desc, char *addr, int len) return orglen; } -/* Make a copy of the string at PTR with SIZE characters +/* Make a copy of the string at PTR with LEN characters (and add a null character at the end in the copy). Uses malloc to get the space. Returns the address of the copy. */ char * -savestring (const char *ptr, size_t size) +savestring (const char *ptr, size_t len) { - char *p = (char *) xmalloc (size + 1); + char *p = (char *) xmalloc (len + 1); - memcpy (p, ptr, size); - p[size] = 0; + memcpy (p, ptr, len); + p[len] = 0; return p; } -- 2.30.2