diff options
| author | Florian Weimer <fweimer@redhat.com> | 2018-11-28 07:00:48 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-12-12 13:24:40 +0100 |
| commit | 0f79dc0be3a5683cf266ef0756fe7feceb4727c9 (patch) | |
| tree | 08190a301a1210c2cb2c94df037fab77a6ab8ba1 | |
| parent | 6b2dd53aa0082f45749b6baa8f229af9c220233c (diff) | |
| download | glibc-0f79dc0be3a5683cf266ef0756fe7feceb4727c9.tar.gz glibc-0f79dc0be3a5683cf266ef0756fe7feceb4727c9.tar.xz glibc-0f79dc0be3a5683cf266ef0756fe7feceb4727c9.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. (cherry picked from commit 47d8d9a2172f827a8dde7695f415aa6f78a82d0e)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | support/support.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index d59e414716..bec58e41b4 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 Florian Weimer <fweimer@redhat.com> * support/support.h (support_quote_string): Declare. diff --git a/support/support.h b/support/support.h index 4d9f7528a6..4ea92e1c21 100644 --- a/support/support.h +++ b/support/support.h @@ -65,10 +65,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 *); /* Error-checking wrapper functions which terminate the process on error. */ |