projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint.mk: prohibit doubled words
[pspp]
/
lib
/
getsockopt.c
diff --git
a/lib/getsockopt.c
b/lib/getsockopt.c
index 3da37a99cda1521ecc92f089ed36be84badae315..c136772a85d15b40bb5c6b09ebfc9bae3e5da3be 100644
(file)
--- a/
lib/getsockopt.c
+++ b/
lib/getsockopt.c
@@
-1,6
+1,6
@@
/* getsockopt.c --- wrappers for Windows getsockopt function
/* getsockopt.c --- wrappers for Windows getsockopt function
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008
-2011
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-35,7
+35,7
@@
#undef getsockopt
int
#undef getsockopt
int
-rpl_getsockopt (int fd, int level, int optname, void *optval,
in
t *optlen)
+rpl_getsockopt (int fd, int level, int optname, void *optval,
socklen_
t *optlen)
{
int r;
SOCKET sock = FD_TO_SOCKET (fd);
{
int r;
SOCKET sock = FD_TO_SOCKET (fd);
@@
-51,7
+51,7
@@
rpl_getsockopt (int fd, int level, int optname, void *optval, int *optlen)
tv.tv_usec = (milliseconds - 1000 * tv.tv_sec) * 1000;
n = sizeof (struct timeval);
if (n > *optlen)
tv.tv_usec = (milliseconds - 1000 * tv.tv_sec) * 1000;
n = sizeof (struct timeval);
if (n > *optlen)
-
n = *optlen;
+ n = *optlen;
memcpy (optval, &tv, n);
*optlen = n;
}
memcpy (optval, &tv, n);
*optlen = n;
}