diff options
| author | Keith Packard <keithp@keithp.com> | 2014-01-29 13:14:22 -0800 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2014-02-25 15:58:57 -0500 |
| commit | 2c7945278c8f5b7c70b0ef12b4024caa43ac152e (patch) | |
| tree | 08c6259a2e9e61fe9ce82778766374768aecf1fc /os | |
| parent | b7cd80d37de51311e4cbf73dc9cdf231c5352bb1 (diff) | |
Warning fixes.
XFS replicates quite a bit of X server infrastructure so that it can
share libXfont. Many of those shared functions are declared in shared
font header files (either fontsproto.h or fontmisc.h). This patch
removes duplicate definitions from the XFS header files and makes sure
the shared header files are included in the right places to get the
functions declared before being defined.
Of course, some of those function types have changed, in particular
CopyISOLatin1Lowered now takes a const char * source parameter.
This patch also stops re-using the 'port' variable in
GetInetdListenInfo when fetching the ReopenInfo. That's not strictly
necessary here, but will be useful when the Reopen API in libxtrans
changes to take a constant parameter.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'os')
| -rw-r--r-- | os/xfstrans.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/os/xfstrans.c b/os/xfstrans.c index 81cd91f..bb1b12a 100644 --- a/os/xfstrans.c +++ b/os/xfstrans.c @@ -89,8 +89,9 @@ TRANS(GetInetdListenInfo) (int fd) */ old_listen = malloc (sizeof (OldListenRec)); if (old_listen != NULL) { + char *old_port; TRANS(GetReopenInfo)(inetdCI, &(old_listen->trans_id), - &(old_listen->fd), &port); + &(old_listen->fd), &old_port); old_listen->portnum = portnum; } |