mirror of
https://github.com/sheumann/hush.git
synced 2024-11-19 23:31:39 +00:00
Fixes for warnings in FreeBSD build
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
1285437217
commit
24915117a2
@ -20,12 +20,14 @@ int FAST_FUNC xgetpty(char *line)
|
||||
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?)");
|
||||
}
|
||||
safe_strncpy(line, name, GETPTY_BUFSIZE);
|
||||
}
|
||||
# else
|
||||
/* find out the name of slave pty */
|
||||
if (ptsname_r(p, line, GETPTY_BUFSIZE-1) != 0) {
|
||||
|
@ -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));
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user