From 1cd5461a5375207602f2cbdfd9a50a9b751cb7c8 Mon Sep 17 00:00:00 2001
From: Trutz Behn
Date: Wed, 3 Jun 2015 19:27:01 +0200
Subject: Use namespace-safe macro, param and variable names

---
 include/unistd.h | 96 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'include/unistd.h')

diff --git a/include/unistd.h b/include/unistd.h
index 7986e52..45304e1 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -37,115 +37,115 @@ extern "C" {
 #undef ttyname_r
 #undef write
 
-fortify_fn(confstr) size_t confstr(int name, char *buf, size_t len)
+_FORTIFY_FN(confstr) size_t confstr(int __n, char *__s, size_t __l)
 {
-	size_t bos = __builtin_object_size(buf, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (len > bos)
+	if (__l > __b)
 		__builtin_trap();
-	return __orig_confstr(name, buf, len);
+	return __orig_confstr(__n, __s, __l);
 }
 
-fortify_fn(getcwd) char *getcwd(char *buf, size_t len)
+_FORTIFY_FN(getcwd) char *getcwd(char *__s, size_t __l)
 {
-	size_t bos = __builtin_object_size(buf, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (len > bos)
+	if (__l > __b)
 		__builtin_trap();
-	return __orig_getcwd(buf, len);
+	return __orig_getcwd(__s, __l);
 }
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #undef getdomainname
-fortify_fn(getdomainname) int getdomainname(char *name, size_t len)
+_FORTIFY_FN(getdomainname) int getdomainname(char *__s, size_t __l)
 {
-	size_t bos = __builtin_object_size(name, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (len > bos)
+	if (__l > __b)
 		__builtin_trap();
-	return __orig_getdomainname(name, len);
+	return __orig_getdomainname(__s, __l);
 }
 #endif
 
-fortify_fn(getgroups) int getgroups(int len, gid_t *set)
+_FORTIFY_FN(getgroups) int getgroups(int __l, gid_t *__s)
 {
-	size_t bos = __builtin_object_size(set, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (len > bos / sizeof(gid_t))
+	if (__l > __b / sizeof(gid_t))
 		__builtin_trap();
-	return __orig_getgroups(len, set);
+	return __orig_getgroups(__l, __s);
 }
 
-fortify_fn(gethostname) int gethostname(char *name, size_t len)
+_FORTIFY_FN(gethostname) int gethostname(char *__s, size_t __l)
 {
-	size_t bos = __builtin_object_size(name, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (len > bos)
+	if (__l > __b)
 		__builtin_trap();
-	return __orig_gethostname(name, len);
+	return __orig_gethostname(__s, __l);
 }
 
-fortify_fn(getlogin_r) int getlogin_r(char *name, size_t len)
+_FORTIFY_FN(getlogin_r) int getlogin_r(char *__s, size_t __l)
 {
-	size_t bos = __builtin_object_size(name, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (len > bos)
+	if (__l > __b)
 		__builtin_trap();
-	return __orig_getlogin_r(name, len);
+	return __orig_getlogin_r(__s, __l);
 }
 
-fortify_fn(pread) ssize_t pread(int fd, void *buf, size_t n, off_t offset)
+_FORTIFY_FN(pread) ssize_t pread(int __f, void *__s, size_t __n, off_t __o)
 {
-	size_t bos = __builtin_object_size(buf, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (n > bos)
+	if (__n > __b)
 		__builtin_trap();
-	return __orig_pread(fd, buf, n, offset);
+	return __orig_pread(__f, __s, __n, __o);
 }
 
-fortify_fn(read) ssize_t read(int fd, void *buf, size_t n)
+_FORTIFY_FN(read) ssize_t read(int __f, void *__s, size_t __n)
 {
-	size_t bos = __builtin_object_size(buf, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (n > bos)
+	if (__n > __b)
 		__builtin_trap();
-	return __orig_read(fd, buf, n);
+	return __orig_read(__f, __s, __n);
 }
 
-fortify_fn(readlink) ssize_t readlink(const char *path, char *buf, size_t n)
+_FORTIFY_FN(readlink) ssize_t readlink(const char *__p, char *__s, size_t __n)
 {
-	size_t bos = __builtin_object_size(buf, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (n > bos)
+	if (__n > __b)
 		__builtin_trap();
-	return __orig_readlink(path, buf, n);
+	return __orig_readlink(__p, __s, __n);
 }
 
-fortify_fn(readlinkat) ssize_t readlinkat(int fd, const char *path, char *buf, size_t n)
+_FORTIFY_FN(readlinkat) ssize_t readlinkat(int __f, const char *__p, char *__s, size_t __n)
 {
-	size_t bos = __builtin_object_size(buf, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (n > bos)
+	if (__n > __b)
 		__builtin_trap();
-	return __orig_readlinkat(fd, path, buf, n);
+	return __orig_readlinkat(__f, __p, __s, __n);
 }
 
-fortify_fn(ttyname_r) int ttyname_r(int fd, char *name, size_t n)
+_FORTIFY_FN(ttyname_r) int ttyname_r(int __f, char *__s, size_t __n)
 {
-	size_t bos = __builtin_object_size(name, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (n > bos)
+	if (__n > __b)
 		__builtin_trap();
-	return __orig_ttyname_r(fd, name, n);
+	return __orig_ttyname_r(__f, __s, __n);
 }
 
-fortify_fn(write) ssize_t write(int fd, const void *buf, size_t n)
+_FORTIFY_FN(write) ssize_t write(int __f, const void *__s, size_t __n)
 {
-	size_t bos = __builtin_object_size(buf, 0);
+	size_t __b = __builtin_object_size(__s, 0);
 
-	if (n > bos)
+	if (__n > __b)
 		__builtin_trap();
-	return __orig_write(fd, buf, n);
+	return __orig_write(__f, __s, __n);
 }
 
 #ifdef __cplusplus
-- 
cgit v1.3