diff options
| author | Denys Vlasenko | 2011-08-28 05:31:49 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2011-08-28 05:31:49 +0200 |
| commit | 24915117a284c5536c9c707fc34ec9e7bf331f32 (patch) | |
| tree | 2e9dd70792921647e31851667bbee13994dc6408 | |
| parent | 1285437217a60194186b2c66a0422205b2dedd08 (diff) | |
| download | busybox-24915117a284c5536c9c707fc34ec9e7bf331f32.zip busybox-24915117a284c5536c9c707fc34ec9e7bf331f32.tar.gz | |
Fixes for warnings in FreeBSD build
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/getpty.c | 18 | ||||
| -rw-r--r-- | libbb/udp_io.c | 2 | ||||
| -rw-r--r-- | miscutils/less.c | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/libbb/getpty.c b/libbb/getpty.c index 6a15cff..435e4d0 100644 --- a/libbb/getpty.c +++ b/libbb/getpty.c @@ -19,20 +19,22 @@ int FAST_FUNC xgetpty(char *line) if (p > 0) { grantpt(p); /* chmod+chown corresponding slave pty */ unlockpt(p); /* (what does this do?) */ -#ifndef HAVE_PTSNAME_R - const char *name; - name = ptsname(p); /* find out the name of slave pty */ - if (!name) { - bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)"); +# ifndef HAVE_PTSNAME_R + { + const char *name; + name = ptsname(p); /* find out the name of slave pty */ + if (!name) { + bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)"); + } + safe_strncpy(line, name, GETPTY_BUFSIZE); } - safe_strncpy(line, name, GETPTY_BUFSIZE); -#else +# else /* find out the name of slave pty */ if (ptsname_r(p, line, GETPTY_BUFSIZE-1) != 0) { bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)"); } line[GETPTY_BUFSIZE-1] = '\0'; -#endif +# endif return p; } #else diff --git a/libbb/udp_io.c b/libbb/udp_io.c index b8fb675..7985a97 100644 --- a/libbb/udp_io.c +++ b/libbb/udp_io.c @@ -13,7 +13,7 @@ * We don't check for errors here. Not supported == won't be used */ void FAST_FUNC -socket_want_pktinfo(int fd) +socket_want_pktinfo(int fd UNUSED_PARAM) { #ifdef IP_PKTINFO setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &const_int_1, sizeof(int)); diff --git a/miscutils/less.c b/miscutils/less.c index 2c6a793..045fd2d 100644 --- a/miscutils/less.c +++ b/miscutils/less.c @@ -721,8 +721,8 @@ static void print_found(const char *line) while (match_status == 0) { char *new = xasprintf("%s%.*s"HIGHLIGHT"%.*s"NORMAL, growline ? growline : "", - match_structs.rm_so, str, - match_structs.rm_eo - match_structs.rm_so, + (int)match_structs.rm_so, str, + (int)(match_structs.rm_eo - match_structs.rm_so), str + match_structs.rm_so); free(growline); growline = new; |