aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2015-08-30 03:47:48 +0200
committerMattias Andrée <maandree@operamail.com>2015-08-30 03:47:48 +0200
commit38ffb52f8e5a7e4e1588f816e9b7cc525dfc95b1 (patch)
tree9e0c3b2848bf719261e6f77b1b6dedaed552ea47
parentadd slibc-error.h (diff)
downloadslibc-38ffb52f8e5a7e4e1588f816e9b7cc525dfc95b1.tar.gz
slibc-38ffb52f8e5a7e4e1588f816e9b7cc525dfc95b1.tar.bz2
slibc-38ffb52f8e5a7e4e1588f816e9b7cc525dfc95b1.tar.xz
remove parameter names from header files to avoid potential errors on inclusion caused by conflictig macro names
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--include/alloca.h2
-rw-r--r--include/assert.h2
-rw-r--r--include/err.h16
-rw-r--r--include/error.h10
-rw-r--r--include/slibc-error.h3
5 files changed, 15 insertions, 18 deletions
diff --git a/include/alloca.h b/include/alloca.h
index 76e027f..3ef962b 100644
--- a/include/alloca.h
+++ b/include/alloca.h
@@ -41,7 +41,7 @@
* space. Do not free it, it will be freed
* automatically when the function returns.
*/
-void* alloca(size_t size);
+void* alloca(size_t);
#if defined(__GNUC__)
# define alloca(size) __builtin_alloca(size)
#endif
diff --git a/include/assert.h b/include/assert.h
index 12d4678..1e351bd 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -89,7 +89,7 @@
* @param line The line in the source code whence the assertion was made
* @param func The function in the source code whence the assertion was made
*/
-void __assert_fail(const char* expression, int errnum, const char* file, int line, const char* func)
+void __assert_fail(const char*, int, const char*, int, const char*)
__noreturn __GCC_ONLY(__attribute__((nonnull(3, 4, 5))));
#endif
diff --git a/include/err.h b/include/err.h
index 432d1af..9c28533 100644
--- a/include/err.h
+++ b/include/err.h
@@ -39,7 +39,7 @@
* @param format Formatting-string for the warning.
* @param ... Formatting-arguments.
*/
-void warn(const char* format, ...)
+void warn(const char*, ...)
__GCC_ONLY(__attribute__((format(printf, 1, 2))));
/**
@@ -51,7 +51,7 @@ void warn(const char* format, ...)
* @param format Formatting-string for the warning.
* @param args Formatting-arguments.
*/
-void vwarn(const char* format, va_list args);
+void vwarn(const char*, va_list);
/**
* Print a warning to stderr, but do not print a
@@ -62,7 +62,7 @@ void vwarn(const char* format, va_list args);
* @param format Formatting-string for the warning.
* @param ... Formatting-arguments.
*/
-void warnx(const char* format, ...)
+void warnx(const char*, ...)
__GCC_ONLY(__attribute__((format(printf, 1, 2))));
/**
@@ -74,7 +74,7 @@ void warnx(const char* format, ...)
* @param format Formatting-string for the warning.
* @param args Formatting-arguments.
*/
-void vwarnx(const char* format, va_list args);
+void vwarnx(const char*, va_list);
/**
* Print an error message to stderr, followed by a
@@ -86,7 +86,7 @@ void vwarnx(const char* format, va_list args);
* @param format Formatting-string for the warning.
* @param ... Formatting-arguments.
*/
-void err(int status, const char* format, ...)
+void err(int, const char*, ...)
__noreturn __GCC_ONLY(__attribute__((format(printf, 2, 3))));
/**
@@ -99,7 +99,7 @@ void err(int status, const char* format, ...)
* @param format Formatting-string for the warning.
* @param args Formatting-arguments.
*/
-void verr(int status, const char* format, va_list args) __noreturn;
+void verr(int, const char*, va_list) __noreturn;
/**
* Print an error message to stderr, but do not print a
@@ -111,7 +111,7 @@ void verr(int status, const char* format, va_list args) __noreturn;
* @param format Formatting-string for the warning.
* @param ... Formatting-arguments.
*/
-void errx(int status, const char* format, ...)
+void errx(int, const char*, ...)
__noreturn __GCC_ONLY(__attribute__((format(printf, 2, 3))));
/**
@@ -124,7 +124,7 @@ void errx(int status, const char* format, ...)
* @param format Formatting-string for the warning.
* @param args Formatting-arguments.
*/
-void verrx(int status, const char* format, va_list args) __noreturn;
+void verrx(int, const char*, va_list) __noreturn;
diff --git a/include/error.h b/include/error.h
index 844f6f6..36cdacc 100644
--- a/include/error.h
+++ b/include/error.h
@@ -43,7 +43,7 @@
* @param format Formatting-string for a detailed description of what happend.
* @param args Formatting-arguments for `format`.
*/
-void error(int status, int errnum, const char* format, ...)
+void error(int, int, const char*, ...)
__GCC_ONLY(__attribute__((format(printf, 3, 4))));
/**
@@ -60,7 +60,7 @@ void error(int status, int errnum, const char* format, ...)
* @param args Formatting-arguments for `format`.
*/
#if defined(_SLIBC_SOURCE)
-void verror(int status, int errnum, const char* format, va_list args);
+void verror(int, int, const char*, va_list);
#endif
@@ -80,8 +80,7 @@ void verror(int status, int errnum, const char* format, va_list args);
* @param format Formatting-string for a detailed description of what happend.
* @param args Formatting-arguments for `format`.
*/
-void error_at_line(int status, int errnum, const char* filename,
- unsigned int linenum, const char* format, ...)
+void error_at_line(int, int, const char*, unsigned int, const char*, ...)
__GCC_ONLY(__attribute__((format(printf, 5, 6))));
/**
@@ -101,8 +100,7 @@ void error_at_line(int status, int errnum, const char* filename,
* @param args Formatting-arguments for `format`.
*/
#if defined(_SLIBC_SOURCE)
-void verror_at_line(int status, int errnum, const char* filename,
- unsigned int linenum, const char* format, va_list args);
+void verror_at_line(int, int, const char*, unsigned int, const char*, va_list);
#endif
diff --git a/include/slibc-error.h b/include/slibc-error.h
index c84faad..768ceef 100644
--- a/include/slibc-error.h
+++ b/include/slibc-error.h
@@ -222,8 +222,7 @@ int* __slibc_error_line(void) __GCC_ONLY(__attribute__((__const__))); /* TODO no
* no description other than the location and `error_string` should be printed.
* @param ... Formatting-arguments for `format`.
*/
-void slibc_perror(const char* progname, const char* filename, int linenum, const char* function,
- int* error_code, const char* error_string, const char* format, ...)
+void slibc_perror(const char*, const char*, int, const char*, int*, const char*, const char*, ...)
__GCC_ONLY(__attribute__((nonnull(2, 4), format(printf, 7, 8))));