summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-11-28 07:00:48 +0100
committerFlorian Weimer <fweimer@redhat.com>2018-11-28 07:16:48 +0100
commit47d8d9a2172f827a8dde7695f415aa6f78a82d0e (patch)
tree33483f2639e24d34623ccecb2b9af6a5aed3b7e1
parentb473b7d88e6829fd0c8a02512b86950dc7089039 (diff)
downloadglibc-47d8d9a2172f827a8dde7695f415aa6f78a82d0e.tar.gz
glibc-47d8d9a2172f827a8dde7695f415aa6f78a82d0e.tar.xz
glibc-47d8d9a2172f827a8dde7695f415aa6f78a82d0e.zip
support_quote_string: Do not use str parameter name
This avoids a build failure if this identifier is used as a macro
in a test.
-rw-r--r--ChangeLog5
-rw-r--r--support/support.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d1ddaad43..b5fbff767f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-28  Florian Weimer  <fweimer@redhat.com>
+
+	* support/support.h (support_quote_string): Do not use str
+	parameter name.
+
 2018-11-27  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/mach/hurd/Makefile ($(common-objpfx)stamp-errnos): Use
diff --git a/support/support.h b/support/support.h
index 835e7173eb..c3ad76901e 100644
--- a/support/support.h
+++ b/support/support.h
@@ -69,10 +69,10 @@ void support_write_file_string (const char *path, const char *contents);
    the result).  */
 char *support_quote_blob (const void *blob, size_t length);
 
-/* Quote the contents of the at STR, in such a way that the result
+/* Quote the contents of the string, in such a way that the result
    string can be included in a C literal (in single/double quotes,
    without putting the quotes into the result).  */
-char *support_quote_string (const char *str);
+char *support_quote_string (const char *);
 
 /* Returns non-zero if the file descriptor is a regular file on a file
    system which supports holes (that is, seeking and writing does not