diff --git a/include/proto/proto_uxst.h b/include/proto/proto_uxst.h deleted file mode 100644 index 11aed981b..000000000 --- a/include/proto/proto_uxst.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * include/proto/proto_uxst.h - * This file contains UNIX-stream socket protocol definitions. - * - * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation, version 2.1 - * exclusively. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _PROTO_PROTO_UXST_H -#define _PROTO_PROTO_UXST_H - -#include -#include -#include - -int uxst_pause_listener(struct listener *l); -int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir); -int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir); - -#endif /* _PROTO_PROTO_UXST_H */ - -/* - * Local variables: - * c-indent-level: 8 - * c-basic-offset: 8 - * End: - */ diff --git a/src/cli.c b/src/cli.c index 1695dbea4..f1f0977a7 100644 --- a/src/cli.c +++ b/src/cli.c @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include diff --git a/src/proto_uxst.c b/src/proto_uxst.c index ae6e3388c..80237b1b4 100644 --- a/src/proto_uxst.c +++ b/src/proto_uxst.c @@ -42,7 +42,6 @@ #include #include #include -#include #include static int uxst_bind_listener(struct listener *listener, char *errmsg, int errlen); @@ -50,6 +49,9 @@ static int uxst_bind_listeners(struct protocol *proto, char *errmsg, int errlen) static int uxst_unbind_listeners(struct protocol *proto); static int uxst_connect_server(struct connection *conn, int data, int delack); static void uxst_add_listener(struct listener *listener, int port); +static int uxst_pause_listener(struct listener *l); +static int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir); +static int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir); /* Note: must not be declared as its list will be overwritten */ static struct protocol proto_unix = { @@ -85,7 +87,7 @@ static struct protocol proto_unix = { * success, -1 in case of error. The socket's source address is stored in * for bytes. */ -int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir) +static int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir) { if (dir) return getsockname(fd, sa, &salen); @@ -100,7 +102,7 @@ int uxst_get_src(int fd, struct sockaddr *sa, socklen_t salen, int dir) * case of success, -1 in case of error. The socket's source address is stored * in for bytes. */ -int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir) +static int uxst_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir) { if (dir) return getpeername(fd, sa, &salen); @@ -386,7 +388,7 @@ static void uxst_add_listener(struct listener *listener, int port) * plain unix sockets since currently it's the new process which handles * the renaming. Abstract sockets are completely unbound. */ -int uxst_pause_listener(struct listener *l) +static int uxst_pause_listener(struct listener *l) { if (((struct sockaddr_un *)&l->addr)->sun_path[0]) return 1; @@ -419,7 +421,7 @@ int uxst_pause_listener(struct listener *l) * The connection's fd is inserted only when SF_ERR_NONE is returned, otherwise * it's invalid and the caller has nothing to do. */ -int uxst_connect_server(struct connection *conn, int data, int delack) +static int uxst_connect_server(struct connection *conn, int data, int delack) { int fd; struct server *srv; diff --git a/src/stats.c b/src/stats.c index 5d4b4c060..6cbda22f1 100644 --- a/src/stats.c +++ b/src/stats.c @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include