summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMukund Sivaraman <muks@banu.com>2009-09-20 13:58:50 +0530
committerMukund Sivaraman <muks@banu.com>2009-09-20 13:58:50 +0530
commit919eedc7f9c2e702162647ae79e6db079f98e981 (patch)
treebf762c20e9057ce245f9b8ad7db2cd69e53baa4c
parent403fd7cc259bea362b2f1f43e517c4e0c1e6f418 (diff)
Remove inline keyword from static functions
The compiler inlines static functions as necessary anyway. No more inline keywords exist in Tinyproxy source code. We want to avoid using this keyword anyway.
-rw-r--r--configure.ac1
-rw-r--r--src/acl.c2
-rw-r--r--src/conffile.c2
-rw-r--r--src/hashmap.c2
-rw-r--r--src/reqs.c6
5 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 8122787..71ed21a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,6 @@ esac
dnl
dnl Checks for types
dnl
-AC_C_INLINE
AC_TYPE_SIZE_T
AC_TYPE_PID_T
AC_TYPE_SIGNAL
diff --git a/src/acl.c b/src/acl.c
index da3e76e..4eb2fcc 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -68,7 +68,7 @@ static vector_t access_list = NULL;
* -1 on failure (invalid mask value)
*
*/
-inline static int
+static int
fill_netmask_array (char *bitmask_string, unsigned char array[],
unsigned int len)
{
diff --git a/src/conffile.c b/src/conffile.c
index 1fb86f0..5e9d766 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -362,7 +362,7 @@ set_bool_arg (unsigned int *var, const char *line, regmatch_t * match)
return 0;
}
-static inline unsigned long int
+static unsigned long int
get_int_arg (const char *line, regmatch_t * match)
{
assert (line);
diff --git a/src/hashmap.c b/src/hashmap.c
index 74eb9c1..f46fdcb 100644
--- a/src/hashmap.c
+++ b/src/hashmap.c
@@ -126,7 +126,7 @@ hashmap_t hashmap_create (unsigned int nbuckets)
* Returns: 0 if the function completed successfully
* negative number is returned if "entry" was NULL
*/
-static inline int delete_hashbucket (struct hashbucket_s *bucket)
+static int delete_hashbucket (struct hashbucket_s *bucket)
{
struct hashentry_s *nextptr;
struct hashentry_s *ptr;
diff --git a/src/reqs.c b/src/reqs.c
index 26b5e3b..66aafca 100644
--- a/src/reqs.c
+++ b/src/reqs.c
@@ -494,7 +494,7 @@ establish_http_connection (struct conn_s *connptr, struct request_s *request)
* Send the appropriate response to the client to establish a SSL
* connection.
*/
-static inline int send_ssl_response (struct conn_s *connptr)
+static int send_ssl_response (struct conn_s *connptr)
{
return write_message (connptr->client_fd,
"%s\r\n"
@@ -783,7 +783,7 @@ ERROR_EXIT:
* the server.
* -rjkaes
*/
-static inline int add_xtinyproxy_header (struct conn_s *connptr)
+static int add_xtinyproxy_header (struct conn_s *connptr)
{
assert (connptr && connptr->server_fd >= 0);
return write_message (connptr->server_fd,
@@ -796,7 +796,7 @@ static inline int add_xtinyproxy_header (struct conn_s *connptr)
* Now insert this information into the hashmap for the connection so it
* can be retrieved and manipulated later.
*/
-static inline int
+static int
add_header_to_connection (hashmap_t hashofheaders, char *header, size_t len)
{
char *sep;