aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-11-29 04:23:27 -0500
committerMike Frysinger <vapier@gentoo.org>2008-11-29 04:39:46 -0500
commit52e42743bfa7f107d47798c5e1282f2690701775 (patch)
treea750617e3e4b2172fbb7fda8ab7d266dc255bf78 /libsbutil/src
parentlibsandbox: use integers rather than strings for functions (diff)
downloadsandbox-52e42743bfa7f107d47798c5e1282f2690701775.tar.gz
sandbox-52e42743bfa7f107d47798c5e1282f2690701775.tar.bz2
sandbox-52e42743bfa7f107d47798c5e1282f2690701775.zip
libsbutil: drop bogus inline usage
Remove inline markings from functions whose bodies are never available at the point of inline calculation (i.e. they're always external functions). Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'libsbutil/src')
-rw-r--r--libsbutil/src/debug.c28
-rw-r--r--libsbutil/src/dynbuf.c4
2 files changed, 16 insertions, 16 deletions
diff --git a/libsbutil/src/debug.c b/libsbutil/src/debug.c
index 4e50a6e..a8c8790 100644
--- a/libsbutil/src/debug.c
+++ b/libsbutil/src/debug.c
@@ -100,7 +100,7 @@ debug_message (const char *file, const char *func, int line,
free (format_str);
}
-inline bool
+bool
check_ptr (const void *ptr)
{
if (NULL == ptr)
@@ -109,7 +109,7 @@ check_ptr (const void *ptr)
return true;
}
-inline bool
+bool
check_str (const char *str)
{
if ((NULL == str) || (0 == strlen (str)))
@@ -118,7 +118,7 @@ check_str (const char *str)
return true;
}
-inline bool
+bool
check_strv (char **str)
{
if ((NULL == str) || (NULL == *str) || (0 == strlen (*str)))
@@ -127,7 +127,7 @@ check_strv (char **str)
return true;
}
-inline bool
+bool
check_fd (int fd)
{
if ((0 >= fd) || (-1 == fcntl (fd, F_GETFL)))
@@ -136,7 +136,7 @@ check_fd (int fd)
return true;
}
-inline bool
+bool
check_fp (FILE *fp)
{
if ((NULL == fp) || (-1 == fileno (fp)))
@@ -145,7 +145,7 @@ check_fp (FILE *fp)
return true;
}
-inline bool
+bool
__check_arg_ptr (const void *ptr, const char *file, const char *func, size_t line)
{
if (!check_ptr (ptr))
@@ -160,7 +160,7 @@ __check_arg_ptr (const void *ptr, const char *file, const char *func, size_t lin
return true;
}
-inline bool
+bool
__check_arg_str (const char *str, const char *file, const char *func, size_t line)
{
if (!check_str (str))
@@ -175,7 +175,7 @@ __check_arg_str (const char *str, const char *file, const char *func, size_t lin
return true;
}
-inline bool
+bool
__check_arg_strv (char **str, const char *file, const char *func, size_t line)
{
if (!check_strv (str))
@@ -190,7 +190,7 @@ __check_arg_strv (char **str, const char *file, const char *func, size_t line)
return true;
}
-inline bool
+bool
__check_arg_fd (int fd, const char *file, const char *func, size_t line)
{
if (!check_fd (fd))
@@ -205,7 +205,7 @@ __check_arg_fd (int fd, const char *file, const char *func, size_t line)
return true;
}
-inline bool
+bool
__check_arg_fp (FILE *fp, const char *file, const char *func, size_t line)
{
if (!check_fp (fp))
@@ -220,7 +220,7 @@ __check_arg_fp (FILE *fp, const char *file, const char *func, size_t line)
return true;
}
-inline void *
+void *
__xcalloc(size_t nmemb, size_t size, const char *file,
const char *func, size_t line)
{
@@ -240,7 +240,7 @@ __xcalloc(size_t nmemb, size_t size, const char *file,
return new_ptr;
}
-inline void *
+void *
__xmalloc (size_t size, const char *file, const char *func, size_t line)
{
void *new_ptr;
@@ -259,7 +259,7 @@ __xmalloc (size_t size, const char *file, const char *func, size_t line)
return new_ptr;
}
-inline void *
+void *
__xrealloc (void *ptr, size_t size, const char *file,
const char *func, size_t line)
{
@@ -279,7 +279,7 @@ __xrealloc (void *ptr, size_t size, const char *file,
return new_ptr;
}
-inline char *
+char *
__xstrndup (const char *str, size_t size, const char *file,
const char *func, size_t line)
{
diff --git a/libsbutil/src/dynbuf.c b/libsbutil/src/dynbuf.c
index 0274ab4..3bd021b 100644
--- a/libsbutil/src/dynbuf.c
+++ b/libsbutil/src/dynbuf.c
@@ -442,7 +442,7 @@ rc_dynbuf_read_eof (rc_dynbuf_t *dynbuf)
return false;
}
-inline bool
+bool
rc_check_dynbuf (rc_dynbuf_t *dynbuf)
{
if ((NULL == dynbuf) || (NULL == dynbuf->data) || (0 == dynbuf->length))
@@ -451,7 +451,7 @@ rc_check_dynbuf (rc_dynbuf_t *dynbuf)
return true;
}
-inline bool
+bool
__rc_check_arg_dynbuf (rc_dynbuf_t *dynbuf, const char *file, const char *func,
size_t line)
{