circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-06 11:46:06 +00:00
Code Issues Projects Releases Wiki Activity

Hide or fix some warnings.

Browse Source
This commit is contained in:
Nicholas Marriott
2017-02-15 08:54:21 +00:00
parent 2b4c144f96
commit 36734afdd8
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -30,6 +30,7 @@ AM_CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
AM_CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare AM_CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
AM_CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align AM_CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
AM_CFLAGS += -Wdeclaration-after-statement -Wno-pointer-sign -Wno-attributes AM_CFLAGS += -Wdeclaration-after-statement -Wno-pointer-sign -Wno-attributes
AM_CFLAGS += -Wno-unused-result
AM_CPPFLAGS += -DDEBUG AM_CPPFLAGS += -DDEBUG
endif endif
if IS_COVERAGE if IS_COVERAGE

26
pty.c
View File

@@ -33,23 +33,28 @@
int pty_open(int *); int pty_open(int *);
pid_t pty_fork(int, int *, char *, size_t, struct winsize *); pid_t pty_fork(int, int *, char *, size_t, struct winsize *);
#ifdef __OpenBSD__
int int
pty_open(int *fd) pty_open(int *fd)
{ {
#ifdef __OpenBSD__
*fd = open(PATH_PTMDEV, O_RDWR|O_CLOEXEC); *fd = open(PATH_PTMDEV, O_RDWR|O_CLOEXEC);
if (*fd < 0) if (*fd < 0)
return (-1); return (-1);
#else
*fd = -1;
#endif
return (0); return (0);
} }
#else
int
pty_open(__unused int *fd)
{
*fd = -1;
return (0);
}
#endif
#ifdef __OpenBSD__
pid_t pid_t
pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws) pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws)
{ {
#ifdef __OpenBSD__
struct ptmget ptm; struct ptmget ptm;
pid_t pid; pid_t pid;
@@ -72,7 +77,12 @@ pty_fork(int ptmfd, int *fd, char *name, size_t namelen, struct winsize *ws)
*fd = ptm.cfd; *fd = ptm.cfd;
close(ptm.sfd); close(ptm.sfd);
return (pid); return (pid);
#else
return (forkpty(fd, name, NULL, ws));
#endif
} }
#else
pid_t
pty_fork(__unused int ptmfd, int *fd, char *name, __unused size_t namelen,
struct winsize *ws)
{
return (forkpty(fd, name, NULL, ws));
}
#endif