unsigned char casts for is*, casts for socket functi, add headers
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10646 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -513,7 +513,7 @@ sink(int argc, char **argv)
|
|||||||
if (*cp++ != ' ')
|
if (*cp++ != ' ')
|
||||||
SCREWUP("mode not delimited");
|
SCREWUP("mode not delimited");
|
||||||
|
|
||||||
for (size = 0; isdigit(*cp);)
|
for (size = 0; isdigit((unsigned char)*cp);)
|
||||||
size = size * 10 + (*cp++ - '0');
|
size = size * 10 + (*cp++ - '0');
|
||||||
if (*cp++ != ' ')
|
if (*cp++ != ' ')
|
||||||
SCREWUP("size not delimited");
|
SCREWUP("size not delimited");
|
||||||
|
@@ -536,10 +536,11 @@ proto (int s, int errsock,
|
|||||||
|
|
||||||
if (sock_debug) {
|
if (sock_debug) {
|
||||||
int one = 1;
|
int one = 1;
|
||||||
if (setsockopt(s, SOL_SOCKET, SO_DEBUG, &one, sizeof(one)) < 0)
|
if (setsockopt(s, SOL_SOCKET, SO_DEBUG, (void *)&one, sizeof(one)) < 0)
|
||||||
warn("setsockopt remote");
|
warn("setsockopt remote");
|
||||||
if (errsock2 != -1 &&
|
if (errsock2 != -1 &&
|
||||||
setsockopt(errsock2, SOL_SOCKET, SO_DEBUG, &one, sizeof(one)) < 0)
|
setsockopt(errsock2, SOL_SOCKET, SO_DEBUG,
|
||||||
|
(void *)&one, sizeof(one)) < 0)
|
||||||
warn("setsockopt stderr");
|
warn("setsockopt stderr");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -57,7 +57,7 @@ isprefix(char *s1, char *s2)
|
|||||||
os1 = s1;
|
os1 = s1;
|
||||||
c1 = *s1;
|
c1 = *s1;
|
||||||
c2 = *s2;
|
c2 = *s2;
|
||||||
while (LOWER(c1) == LOWER(c2)) {
|
while (tolower((unsigned char)c1) == tolower((unsigned char)c2)) {
|
||||||
if (c1 == '\0')
|
if (c1 == '\0')
|
||||||
break;
|
break;
|
||||||
c1 = *++s1;
|
c1 = *++s1;
|
||||||
|
@@ -579,7 +579,7 @@ mklist(char *buf, char *name)
|
|||||||
#define ISASCII(c) (!((c)&0x80))
|
#define ISASCII(c) (!((c)&0x80))
|
||||||
if ((c == ' ') || !ISASCII(c))
|
if ((c == ' ') || !ISASCII(c))
|
||||||
n = 1;
|
n = 1;
|
||||||
else if (islower(c))
|
else if (islower((unsigned char)c))
|
||||||
*cp = toupper(c);
|
*cp = toupper(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -149,6 +149,7 @@
|
|||||||
#include <socks.h>
|
#include <socks.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <err.h>
|
||||||
#include <roken.h>
|
#include <roken.h>
|
||||||
/* krb.h? */
|
/* krb.h? */
|
||||||
|
|
||||||
|
@@ -1152,7 +1152,7 @@ printdata(char *tag, char *ptr, int cnt)
|
|||||||
output_data("%s: ", tag);
|
output_data("%s: ", tag);
|
||||||
for (i = 0; i < 20 && cnt; i++) {
|
for (i = 0; i < 20 && cnt; i++) {
|
||||||
output_data("%02x", *ptr);
|
output_data("%02x", *ptr);
|
||||||
if (isprint(*ptr)) {
|
if (isprint((unsigned char)*ptr)) {
|
||||||
xbuf[i] = *ptr;
|
xbuf[i] = *ptr;
|
||||||
} else {
|
} else {
|
||||||
xbuf[i] = '.';
|
xbuf[i] = '.';
|
||||||
|
@@ -65,7 +65,7 @@ make_listen_socket (krb5_context context)
|
|||||||
fd = socket (AF_INET, SOCK_STREAM, 0);
|
fd = socket (AF_INET, SOCK_STREAM, 0);
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
krb5_err (context, 1, errno, "socket AF_INET");
|
krb5_err (context, 1, errno, "socket AF_INET");
|
||||||
setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
|
setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(one));
|
||||||
memset (&addr, 0, sizeof(addr));
|
memset (&addr, 0, sizeof(addr));
|
||||||
addr.sin_family = AF_INET;
|
addr.sin_family = AF_INET;
|
||||||
addr.sin_port = krb5_getportbyname (context,
|
addr.sin_port = krb5_getportbyname (context,
|
||||||
@@ -461,7 +461,7 @@ main(int argc, char **argv)
|
|||||||
struct sockaddr_un peer_addr;
|
struct sockaddr_un peer_addr;
|
||||||
socklen_t peer_len = sizeof(peer_addr);
|
socklen_t peer_len = sizeof(peer_addr);
|
||||||
|
|
||||||
if(recvfrom(signal_fd, &vers, sizeof(vers), 0,
|
if(recvfrom(signal_fd, (void *)&vers, sizeof(vers), 0,
|
||||||
(struct sockaddr *)&peer_addr, &peer_len) < 0) {
|
(struct sockaddr *)&peer_addr, &peer_len) < 0) {
|
||||||
krb5_warn (context, errno, "recvfrom");
|
krb5_warn (context, errno, "recvfrom");
|
||||||
continue;
|
continue;
|
||||||
|
Reference in New Issue
Block a user