public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] hurd: Use __trivfs_server_name instead of trivfs_server_name
@ 2022-01-01 16:53 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2022-01-01 16:53 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=edb5ab841a049c8a8267ebc4d537eec690952daa
commit edb5ab841a049c8a8267ebc4d537eec690952daa
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Jan 1 17:51:18 2022 +0100
hurd: Use __trivfs_server_name instead of trivfs_server_name
The latter violates namespace contraints
Diff:
---
sysdeps/mach/hurd/getrandom.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/sysdeps/mach/hurd/getrandom.c b/sysdeps/mach/hurd/getrandom.c
index 24f9ac60f7..76f2e900d2 100644
--- a/sysdeps/mach/hurd/getrandom.c
+++ b/sysdeps/mach/hurd/getrandom.c
@@ -21,7 +21,7 @@
#include <unistd.h>
#include <not-cancel.h>
-extern char *trivfs_server_name __attribute__((weak));
+extern char *__trivfs_server_name __attribute__((weak));
/* Write up to LENGTH bytes of randomness starting at BUFFER.
Return the number of bytes written, or -1 on error. */
@@ -33,14 +33,14 @@ __getrandom (void *buffer, size_t length, unsigned int flags)
size_t amount_read;
int fd;
- if (&trivfs_server_name && trivfs_server_name
- && trivfs_server_name[0] == 'r'
- && trivfs_server_name[1] == 'a'
- && trivfs_server_name[2] == 'n'
- && trivfs_server_name[3] == 'd'
- && trivfs_server_name[4] == 'o'
- && trivfs_server_name[5] == 'm'
- && trivfs_server_name[6] == '\0')
+ if (&__trivfs_server_name && __trivfs_server_name
+ && __trivfs_server_name[0] == 'r'
+ && __trivfs_server_name[1] == 'a'
+ && __trivfs_server_name[2] == 'n'
+ && __trivfs_server_name[3] == 'd'
+ && __trivfs_server_name[4] == 'o'
+ && __trivfs_server_name[5] == 'm'
+ && __trivfs_server_name[6] == '\0')
/* We are random, don't try to read ourselves! */
return length;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-01-01 16:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-01 16:53 [glibc] hurd: Use __trivfs_server_name instead of trivfs_server_name Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).