[LINUX5250] Small patch 1/2

["Ruel, Marc-Antoine" <maruel@xxxxxxxxxxxxxxx>]

I just finished merging.

I have 2 patches to submit.

First, I removed the last static variable in sslstream.c. At the same time, I 
set some pointers to NULL after terminal deletion (because I found a bug in 
win32 port and it is easier to fix when the deleted pointers are set to null). 
Finally, I added parenthesis for comprehension (and to remove compiler 
warnings) to this "(1 << (sb_buf[i]+1))" instead of 
"(1 << sb_buf[i]+1)".

Second patch follows shortly. (the win32 port update)

M-A

**** CUT HERE ****
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tn5250/tn5250/ChangeLog,v
retrieving revision 1.229
diff -u -r1.229 ChangeLog
--- ChangeLog   1 Apr 2005 06:42:52 -0000       1.229
+++ ChangeLog   1 Apr 2005 21:36:38 -0000
@@ -1,3 +1,7 @@
+2005-04-01 Marc-Antoine Ruel <maruel@xxxxxxxxxxxx>
+- Removed last static variable in sslstream
+- Small cosmetic changes
+
 2005-03-31 James Rich <james@xxxxxxxxxxx>
 - Add support for delete in word wrap fields.
 - Fix bug involving cursor movement at end of continuous subfields.
Index: src/session.c
===================================================================
RCS file: /cvsroot/tn5250/tn5250/src/session.c,v
retrieving revision 1.74
diff -u -r1.74 session.c
--- src/session.c       1 Apr 2005 06:42:59 -0000       1.74
+++ src/session.c       1 Apr 2005 21:24:23 -0000
@@ -138,14 +138,17 @@
   if (This->stream != NULL)
     {
       tn5250_stream_destroy (This->stream);
+      This->stream = NULL;
     }
   if (This->record != NULL)
     {
       tn5250_record_destroy (This->record);
+      This->record = NULL;
     }
   if (This->config != NULL)
     {
       tn5250_config_unref (This->config);
+      This->config = NULL;
     }
   free (This);
   return;
Index: src/sslstream.c
===================================================================
RCS file: /cvsroot/tn5250/tn5250/src/sslstream.c,v
retrieving revision 1.14
diff -u -r1.14 sslstream.c
--- src/sslstream.c     8 Mar 2005 16:52:02 -0000       1.14
+++ src/sslstream.c     1 Apr 2005 21:05:04 -0000
@@ -350,7 +350,7 @@
 {
    int len;
    char methstr[5];
-   static SSL_METHOD *meth=NULL;
+   SSL_METHOD *meth=NULL;
 
    TN5250_LOG(("tn5250_ssl_stream_init() entered.\n"));
 
@@ -1165,7 +1165,7 @@
          for(i=0; i<sb_len && sb_buf[i] != IAC; i++)
            {
              tn5250_buffer_append_byte(&tbuf, sb_buf[i]);
-             This->options = This->options | (1 << sb_buf[i]+1);
+             This->options = This->options | (1 << (sb_buf[i]+1));
            }
          
          tn5250_buffer_append_byte(&tbuf, IAC);
Index: src/telnetstr.c
===================================================================
RCS file: /cvsroot/tn5250/tn5250/src/telnetstr.c,v
retrieving revision 1.30
diff -u -r1.30 telnetstr.c
--- src/telnetstr.c     8 Mar 2005 16:52:02 -0000       1.30
+++ src/telnetstr.c     1 Apr 2005 21:05:15 -0000
@@ -868,7 +868,7 @@
          for(i=0; i<sb_len && sb_buf[i] != IAC; i++)
            {
              tn5250_buffer_append_byte(&tbuf, sb_buf[i]);
-             This->options = This->options | (1 << sb_buf[i]+1);
+             This->options = This->options | (1 << (sb_buf[i]+1));
            }
          
          tn5250_buffer_append_byte(&tbuf, IAC);