oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

use socklen_t where appropriate instead of int

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8923 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-08-09 20:53:11 +00:00
parent 2f99d01709
commit 5f648d3799
21 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
appl/ftp/ftp/ftp.c
View File

@@ -60,7 +60,7 @@ hookup (const char *host, int port)
struct addrinfo hints;
int error;
char portstr[NI_MAXSERV];
int len;
socklen_t len;
int s;
memset (&hints, 0, sizeof(hints));
@@ -1240,7 +1240,7 @@ static int
active_mode (void)
{
int tmpno = 0;
int len;
socklen_t len;
int result;
noport:
@@ -1366,7 +1366,8 @@ dataconn (const char *lmode)
{
struct sockaddr_storage from_ss;
struct sockaddr *from = (struct sockaddr *)&from_ss;
int s, fromlen = sizeof (from_ss);
socklen_t fromlen = sizeof(from_ss);
int s;
if (passivemode)
return (fdopen (data, lmode));

9
appl/ftp/ftpd/ftpd.c
View File

@@ -252,7 +252,8 @@ show_file(const char *file, int code)
int
main(int argc, char **argv)
{
int his_addr_len, ctrl_addr_len, on = 1;
socklen_t his_addr_len, ctrl_addr_len;
int on = 1;
int port;
struct servent *sp;
@@ -1254,7 +1255,7 @@ dataconn(const char *name, off_t size, const char *mode)
struct sockaddr_storage from_ss;
struct sockaddr *from = (struct sockaddr *)&from_ss;
int s;
int fromlen = sizeof(from_ss);
socklen_t fromlen = sizeof(from_ss);
s = accept(pdata, from, &fromlen);
if (s < 0) {
@@ -1922,7 +1923,7 @@ myoob(int signo)
void
pasv(void)
{
int len;
socklen_t len;
char *p, *a;
struct sockaddr_in *sin;
@@ -1972,7 +1973,7 @@ pasv_error:
void
epsv(char *proto)
{
int len;
socklen_t len;
pdata = socket(ctrl_addr->sa_family, SOCK_STREAM, 0);
if (pdata < 0) {

2
appl/kx/common.c
View File

@@ -732,7 +732,7 @@ int
suspicious_address (int sock, struct sockaddr_in addr)
{
char data[40];
int len = sizeof(data);
socklen_t len = sizeof(data);
return addr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)
#if defined(IP_OPTIONS) && defined(HAVE_GETSOCKOPT)

4
appl/kx/kx.c
View File

@@ -98,7 +98,7 @@ connect_host (kx_context *kc)
struct addrinfo hints;
int error;
char portstr[NI_MAXSERV];
int addrlen;
socklen_t addrlen;
int s;
struct sockaddr_storage thisaddr_ss;
struct sockaddr *thisaddr = (struct sockaddr *)&thisaddr_ss;
@@ -445,7 +445,7 @@ doit_active (kx_context *kc)
fd_set fdset;
pid_t child;
int fd, thisfd = -1;
int zero = 0;
socklen_t zero = 0;
FD_ZERO(&fdset);
for (i = 0; i < nsockets; ++i)

8
appl/kx/kxd.c
View File

@@ -112,7 +112,7 @@ recv_conn (int sock, kx_context *kc,
{
u_char msg[1024], *p;
char user[256];
int addrlen;
socklen_t addrlen;
struct passwd *passwd;
struct sockaddr_in thisaddr, thataddr;
char remotehost[MaxHostNameLen];
@@ -295,7 +295,7 @@ doit_conn (kx_context *kc,
int sock, sock2;
struct sockaddr_in addr;
struct sockaddr_in thisaddr;
int addrlen;
socklen_t addrlen;
u_char msg[1024], *p;
sock = socket (AF_INET, SOCK_STREAM, 0);
@@ -509,7 +509,7 @@ doit_passive (kx_context *kc,
if (FD_ISSET(sockets[i].fd, &fds)) {
if (sockets[i].flags == TCP) {
struct sockaddr_in peer;
int len = sizeof(peer);
socklen_t len = sizeof(peer);
fd = accept (sockets[i].fd,
(struct sockaddr *)&peer,
@@ -524,7 +524,7 @@ doit_passive (kx_context *kc,
errno = EINTR;
}
} else if(sockets[i].flags == UNIX_SOCKET) {
int zero = 0;
socklen_t zero = 0;
fd = accept (sockets[i].fd, NULL, &zero);

2
appl/popper/pop_init.c
View File

@@ -245,7 +245,7 @@ pop_init(POP *p,int argcount,char **argmessage)
{
struct sockaddr_storage cs_ss;
struct sockaddr *cs = (struct sockaddr *)&cs_ss;
int len;
socklen_t len;
char * trace_file_name = "/tmp/popper-trace";
int portnum = 0;
int optind = 0;

2
appl/rsh/rshd.c
View File

@@ -581,7 +581,7 @@ doit (int do_kerberos, int check_rhosts)
struct sockaddr *thataddr = (struct sockaddr *)&thataddr_ss;
struct sockaddr_storage erraddr_ss;
struct sockaddr *erraddr = (struct sockaddr *)&erraddr_ss;
int addrlen;
socklen_t addrlen;
int port;
int errsock = -1;
char client_user[COMMAND_SZ], server_user[USERNAME_SZ];

2
appl/telnet/libtelnet/kerberos.c
View File

@@ -272,7 +272,7 @@ kerberos4_is(Authenticator *ap, unsigned char *data, int cnt)
char realm[REALM_SZ];
char instance[INST_SZ];
int r;
int addr_len;
socklen_t addr_len;
if (cnt-- < 1)
return;

7
appl/telnet/telnetd/telnetd.c
View File

@@ -143,7 +143,8 @@ main(int argc, char **argv)
{
struct sockaddr_storage __ss;
struct sockaddr *sa = (struct sockaddr *)&__ss;
int on = 1, sa_size;
int on = 1;
socklen_t sa_size;
int ch;
#if defined(IPPROTO_IP) && defined(IP_TOS)
int tos = -1;
@@ -362,9 +363,9 @@ main(int argc, char **argv)
* Get socket's security label
*/
if (secflag) {
int szss = sizeof(ss);
socklen_t szss = sizeof(ss);
int sock_multi;
int szi = sizeof(int);
socklen_t szi = sizeof(int);
memset(&dv, 0, sizeof(dv));

4
appl/test/gssapi_client.c
View File

@@ -85,7 +85,7 @@ static int
proto (int sock, const char *hostname, const char *service)
{
struct sockaddr_in remote, local;
int addrlen;
socklen_t addrlen;
int context_established = 0;
gss_ctx_id_t context_hdl = GSS_C_NO_CONTEXT;
@@ -140,7 +140,7 @@ proto (int sock, const char *hostname, const char *service)
input_chan_bindings.acceptor_address.value = acct_buf;
#if 0
input_chan_bindings.application_data.value = malloc(4);
input_chan_bindings.application_data.value = emalloc(4);
* (unsigned short*)input_chan_bindings.application_data.value = local.sin_port;
* ((unsigned short *)input_chan_bindings.application_data.value + 1) = remote.sin_port;
input_chan_bindings.application_data.length = 4;

6
appl/test/gssapi_server.c
View File

@@ -105,7 +105,7 @@ static int
proto (int sock, const char *service)
{
struct sockaddr_in remote, local;
int addrlen;
socklen_t addrlen;
gss_ctx_id_t context_hdl = GSS_C_NO_CONTEXT;
gss_buffer_desc real_input_token, real_output_token;
gss_buffer_t input_token = &real_input_token,
@@ -144,7 +144,7 @@ proto (int sock, const char *service)
acct_buf[2] = (local.sin_addr.s_addr >> 8) & 0xFF;
acct_buf[3] = (local.sin_addr.s_addr >> 0) & 0xFF;
input_chan_bindings.acceptor_address.value = acct_buf;
input_chan_bindings.application_data.value = malloc(4);
input_chan_bindings.application_data.value = emalloc(4);
#if 0
* (unsigned short *)input_chan_bindings.application_data.value =
remote.sin_port;
@@ -156,7 +156,7 @@ proto (int sock, const char *service)
input_chan_bindings.application_data.value = NULL;
#endif
delegated_cred_handle = malloc(sizeof(*delegated_cred_handle));
delegated_cred_handle = emalloc(sizeof(*delegated_cred_handle));
memset((char*)delegated_cred_handle, 0, sizeof(*delegated_cred_handle));
do {

2
appl/test/nt_gss_client.c
View File

@@ -46,7 +46,7 @@ static int
proto (int sock, const char *hostname, const char *service)
{
struct sockaddr_in remote, local;
int addrlen;
socklen_t addrlen;
int context_established = 0;
gss_ctx_id_t context_hdl = GSS_C_NO_CONTEXT;

2
appl/test/nt_gss_server.c
View File

@@ -66,7 +66,7 @@ static int
proto (int sock, const char *service)
{
struct sockaddr_in remote, local;
int addrlen;
socklen_t addrlen;
gss_ctx_id_t context_hdl = GSS_C_NO_CONTEXT;
gss_buffer_t input_token, output_token;
gss_buffer_desc real_input_token, real_output_token;

2
appl/test/uu_client.c
View File

@@ -40,7 +40,7 @@ static int
proto (int sock, const char *hostname, const char *service)
{
struct sockaddr_in remote, local;
int addrlen;
socklen_t addrlen;
krb5_address remote_addr, local_addr;
krb5_context context;
krb5_ccache ccache;

2
appl/test/uu_server.c
View File

@@ -40,7 +40,7 @@ static int
proto (int sock, const char *service)
{
struct sockaddr_in remote, local;
int addrlen;
socklen_t addrlen;
krb5_address remote_addr, local_addr;
krb5_ccache ccache;
krb5_auth_context auth_context;