commit 2c684081c14303eb854cf04dde3367c104efed6e
author Patrik Stridvall <ps@leissner.se> Sat Jul 31 17:36:48 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Jul 31 17:36:48 1999 +0000
tree fe7a53fadb38bac10ac155a4f822a25cf94c53ea
parent cf4333240c2a8076a932d30627c2550f70df32b5

Fixed some of the issues reported by Solaris Lint.

console/generic.c

diff --git a/console/generic.c b/console/generic.c
index d45813a..eeedc08 100644
--- a/console/generic.c
+++ b/console/generic.c
@@ -69,8 +69,8 @@
 {
    /* Scroll Up Window: Characters go down */
 
-   char trow, tcol;
-   int old_refresh, x;
+   char trow, tcol, x;
+   int old_refresh;
 
    TRACE("Scroll Up %d lines from %d to %d.\n", lines, row1,
       row2);
@@ -101,8 +101,8 @@
 {
    /* Scroll Down Window: Characters go up */
 
-   char trow, tcol;
-   int old_refresh, x;
+   char trow, tcol, x;
+   int old_refresh;
 
    /* Abort if we have only partial functionality */
    if (!(driver.getCursorPosition && driver.moveCursor && driver.write
@@ -144,7 +144,7 @@
       functions but may be useful elsewhere. If it can be used from
       outside here, it should be made non-static */
 
-   int x;
+   char x;
 
    TRACE("Clear Line: %d from %d to %d.\n", row, col1, col2);
 
@@ -165,7 +165,7 @@
       functions but may be useful elsewhere. If it can be used from
       outside here, it should be made non-static */
 
-   int x;
+   char x;
    int bg_color, fg_color, attribute;
    char ch;
 

console/xterm.c

diff --git a/console/xterm.c b/console/xterm.c
index 8c2e7bc..35ba5eb 100644
--- a/console/xterm.c
+++ b/console/xterm.c
@@ -25,9 +25,9 @@
 
 char console_xterm_prog[80];
 
-static BOOL wine_create_console(FILE **master, FILE **slave, int *pid);
-FILE *wine_openpty(int *master, int *slave, char *name,
-                        struct termios *term, struct winsize *winsize);
+static BOOL wine_create_console(FILE **master, FILE **slave, pid_t *pid);
+int wine_openpty(int *master, int *slave, char *name,
+		 struct termios *term, struct winsize *winsize);
 
 /* The console -- I chose to keep the master and slave
  * (UNIX) file descriptors around in case they are needed for
@@ -36,7 +36,7 @@
 typedef struct _XTERM_CONSOLE {
         FILE    *master;                 /* xterm side of pty */
         FILE    *slave;                  /* wine side of pty */
-        int     pid;                     /* xterm's pid, -1 if no xterm */
+        pid_t    pid;                    /* xterm's pid, -1 if no xterm */
 } XTERM_CONSOLE;
 
 static XTERM_CONSOLE xterm_console;
@@ -109,7 +109,7 @@
 }
 
 
-static BOOL wine_create_console(FILE **master, FILE **slave, int *pid)
+static BOOL wine_create_console(FILE **master, FILE **slave, pid_t *pid)
 {
         /* There is definately a bug in this routine that causes a lot
            of garbage to be written to the screen, but I can't find it...