vaccinewars

commit 7be4dd2a324bd6fb2015f156377c6e8cdf8ccab7
parent 9c6396a30753acd7b3af07108f173bfc0378d681
Author: Ben Webb <ben@salilab.org>
Date:   Fri, 30 Dec 2005 02:28:12 +0000

Fix a few uninitialized variable and incorrect signedness warnings.


Diffstat:
M
src/gui_client/gtk_client.c
 | 
1
+
M
src/network.c
 | 
6
+++---
M
src/tstring.c
 | 
4
++--

3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c
@@ -685,6 +685,7 @@ void AddScoreToDialog(char *Data)
     color.red = 0;
     color.green = 0;
     color.blue = 0xDDDD;
+    color.pixel = 0;
     style = gtk_style_new();
     style->fg[GTK_STATE_NORMAL] = color;
     gtk_widget_set_style(label, style);
diff --git a/src/network.c b/src/network.c
@@ -520,7 +520,7 @@ void SendSocks5UserPasswd(NetworkBuffer *NetBuf, gchar *user,
 
 static gboolean Socks5Connect(NetworkBuffer *NetBuf)
 {
-  guchar *addpt;
+  gchar *addpt;
   guint addlen, hostlen;
   ConnBuf *conn;
   unsigned short int netport;
@@ -555,7 +555,7 @@ static gboolean Socks5Connect(NetworkBuffer *NetBuf)
 
 static gboolean HandleSocksReply(NetworkBuffer *NetBuf)
 {
-  guchar *data;
+  gchar *data;
   guchar addrtype;
   guint replylen;
   gboolean retval = TRUE;
@@ -993,7 +993,7 @@ gboolean StartSocksNegotiation(NetworkBuffer *NetBuf, gchar *RemoteHost,
   guint num_methods;
   ConnBuf *conn;
   struct hostent *he;
-  guchar *addpt;
+  gchar *addpt;
   guint addlen, i;
   struct in_addr *haddr;
   unsigned short int netport;
diff --git a/src/tstring.c b/src/tstring.c
@@ -158,8 +158,8 @@ void GetNextFormat(guint *Index, gchar *str, int *StartPos,
 
 gchar *HandleTFmt(gchar *format, va_list va)
 {
-  int StrInd, StartPos, EndPos, FmtPos, Wid, Prec;
-  guint i, ArgNum, DefaultArgNum;
+  int StrInd, StartPos, EndPos, FmtPos, Wid, Prec, ArgNum, DefaultArgNum;
+  guint i;
   char Code[3], Type;
   gchar *retstr, *fstr;
   GString *string, *tmpfmt;