diff options
author | lteo <> | 2015-09-10 02:23:29 +0000 |
---|---|---|
committer | lteo <> | 2015-09-10 02:23:29 +0000 |
commit | c143c9d71e4795a5b3f6992198aabc7c22335b59 (patch) | |
tree | 9e6275074bc94ebe80e7cf76ef6b88c653081f00 /src | |
parent | 84a0be6cfb53705a1cdab6b7568894d8c88b2d17 (diff) | |
download | openbsd-c143c9d71e4795a5b3f6992198aabc7c22335b59.tar.gz openbsd-c143c9d71e4795a5b3f6992198aabc7c22335b59.tar.bz2 openbsd-c143c9d71e4795a5b3f6992198aabc7c22335b59.zip |
Remove SOCKET_PROTOCOL, a redundant define that was only used once.
No binary change.
ok millert@ miod@
Diffstat (limited to 'src')
-rw-r--r-- | src/usr.bin/openssl/s_socket.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/s_socket.c b/src/usr.bin/openssl/s_socket.c index f9d9e5a899..869211de73 100644 --- a/src/usr.bin/openssl/s_socket.c +++ b/src/usr.bin/openssl/s_socket.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s_socket.c,v 1.7 2015/07/20 03:22:25 doug Exp $ */ | 1 | /* $OpenBSD: s_socket.c,v 1.8 2015/09/10 02:23:29 lteo Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -77,8 +77,6 @@ static int init_server(int *sock, int port, int type); | |||
77 | static int init_server_long(int *sock, int port, char *ip, int type); | 77 | static int init_server_long(int *sock, int port, char *ip, int type); |
78 | static int do_accept(int acc_sock, int *sock, char **host); | 78 | static int do_accept(int acc_sock, int *sock, char **host); |
79 | 79 | ||
80 | #define SOCKET_PROTOCOL IPPROTO_TCP | ||
81 | |||
82 | int | 80 | int |
83 | init_client(int *sock, char *host, char *port, int type, int af) | 81 | init_client(int *sock, char *host, char *port, int type, int af) |
84 | { | 82 | { |
@@ -187,7 +185,7 @@ init_server_long(int *sock, int port, char *ip, int type) | |||
187 | memcpy(&server.sin_addr.s_addr, ip, 4); | 185 | memcpy(&server.sin_addr.s_addr, ip, 4); |
188 | 186 | ||
189 | if (type == SOCK_STREAM) | 187 | if (type == SOCK_STREAM) |
190 | s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); | 188 | s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); |
191 | else /* type == SOCK_DGRAM */ | 189 | else /* type == SOCK_DGRAM */ |
192 | s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); | 190 | s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); |
193 | 191 | ||