fix a couple of warnings - Guido de Jong

svn path=/trunk/; revision=2580
This commit is contained in:
Steven Edwards 2002-01-31 04:22:50 +00:00
parent 8d8acf54de
commit c331ef4c1b
3 changed files with 15 additions and 15 deletions

View file

@ -22,7 +22,7 @@ GetSocketBufSize(int sockfd, size_t *const rsize, size_t *const ssize)
if (ssize != NULL) {
opt = 0;
optsize = sizeof(opt);
rc = getsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &opt, &optsize);
rc = getsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, (char *) &opt, &optsize);
if (rc == 0)
*ssize = (size_t) opt;
else
@ -31,7 +31,7 @@ GetSocketBufSize(int sockfd, size_t *const rsize, size_t *const ssize)
if (rsize != NULL) {
opt = 0;
optsize = sizeof(opt);
rc = getsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &opt, &optsize);
rc = getsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, (char *) &opt, &optsize);
if (rc == 0)
*rsize = (size_t) opt;
else
@ -64,14 +64,14 @@ SetSocketBufSize(int sockfd, size_t rsize, size_t ssize)
if (ssize > 0) {
opt = (int) ssize;
optsize = sizeof(opt);
rc = setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &opt, optsize);
rc = setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, (const char *) &opt, optsize);
if (rc < 0)
return (rc);
}
if (rsize > 0) {
opt = (int) rsize;
optsize = sizeof(opt);
rc = setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &opt, optsize);
rc = setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, (const char *) &opt, optsize);
if (rc < 0)
return (rc);
}

View file

@ -21,10 +21,10 @@
#define SELECT_TYPE_ARG1 int
/* Define to the type of args 2, 3 and 4 for select(). */
#define SELECT_TYPE_ARG234 (fd_set FAR *)
#define SELECT_TYPE_ARG234 (PFD_SET)
/* Define to the type of arg5 for select(). */
#define SELECT_TYPE_ARG5 (const struct timeval FAR *)
#define SELECT_TYPE_ARG5 (PTIMEVAL)
/* Define to `unsigned' if <sys/types.h> doesn't define. */
/* #undef size_t */

View file

@ -47,13 +47,13 @@ static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
#include <sys/types.h>
/*#include <sys/socket.h>*/
#include <winsock2.h>
/*#include <netinet/in.h>*/
/*#include <netdb.h>*/
/* #include <sys/socket.h> */
/* #include <netinet/in.h> */
/* #include <netdb.h> */
#include <stdio.h>
//#include <various.h>
/* #include <various.h> */
#include <getopt.h>
#include <io.h>
@ -62,7 +62,7 @@ static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
void usage();
void leave(int iExitCode);
void main(int argc, char **argv)
int main(int argc, char **argv)
{
extern char *optarg;
extern int optind;
@ -98,9 +98,9 @@ void main(int argc, char **argv)
if ( err != 0 )
{
/* Tell the user that we couldn't find a usable */
/* WinSock DLL. */
fprintf(stderr, "WSAStartup failed\n");
return;
/* WinSock DLL. */
perror("whois: WSAStartup failed");
leave(1);
}
hp = gethostbyname(host);
@ -172,4 +172,4 @@ void leave(int iExitCode)
{
WSACleanup();
exit(iExitCode);
}
}