Patch from Colin Watson intended to give a clean Unix compile with GCC 4.

[PuTTY.git] / settings.c

diff --git a/settings.c b/settings.c
index 9aeaf530a1e9dc0d6c767ce22827867b30079027..5040fa25e585bd056b938a85ca2eeaaaf1d4c3a9 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -464,6 +464,7 @@ void load_open_settings(void *sesskey, int do_host, Config *cfg)
     cfg->ssh_subsys = 0;              /* FIXME: load this properly */
     cfg->remote_cmd_ptr = NULL;
     cfg->remote_cmd_ptr2 = NULL;
+    cfg->ssh_nc_host[0] = '\0';
 
     if (do_host) {
        gpps(sesskey, "HostName", "", cfg->host, sizeof(cfg->host));
@@ -768,8 +769,8 @@ void load_open_settings(void *sesskey, int do_host, Config *cfg)
     gppi(sesskey, "SerialSpeed", 9600, &cfg->serspeed);
     gppi(sesskey, "SerialDataBits", 8, &cfg->serdatabits);
     gppi(sesskey, "SerialStopHalfbits", 2, &cfg->serstopbits);
-    gppi(sesskey, "SerialParity", 0, &cfg->serparity);
-    gppi(sesskey, "SerialFlowControl", 0, &cfg->serflow);
+    gppi(sesskey, "SerialParity", SER_PAR_NONE, &cfg->serparity);
+    gppi(sesskey, "SerialFlowControl", SER_FLOW_XONXOFF, &cfg->serflow);
 }
 
 void do_defaults(char *session, Config * cfg)