Skip to content
Snippets Groups Projects
Commit 3acd92b0 authored by rswindell's avatar rswindell
Browse files

Now uses iniGet/ReadExistingString(), which do nothing (just return NULL) if

the key doesn't exist.
parent 461f6fef
No related branches found
No related tags found
No related merge requests found
......@@ -1291,8 +1291,7 @@ void parse_ini_file(const char* ini_fname)
/* [COM] Section */
section="COM";
if(iniKeyExists(list, section, "Device"))
iniGetString(list, section, "Device", NULL, com_dev);
iniGetExistingString(list, section, "Device", NULL, com_dev);
com_baudrate = iniGetLongInt(list, section, "BaudRate", com_baudrate);
com_hangup = iniGetBool(list, section, "Hangup", com_hangup);
dcd_timeout = iniGetInteger(list, section, "DCDTimeout", dcd_timeout);
......@@ -1302,20 +1301,15 @@ void parse_ini_file(const char* ini_fname)
/* [Modem] Section */
section="Modem";
if(iniKeyExists(list, section, "Init"))
iniGetString(list, section, "Init", "", mdm_init);
if(iniKeyExists(list, section, "AutoAnswer"))
iniGetString(list, section, "AutoAnswer", "", mdm_autoans);
if(iniKeyExists(list, section, "Cleanup"))
iniGetString(list, section, "Cleanup", "", mdm_cleanup);
if(iniKeyExists(list, section, "EnableCallerID"))
iniGetString(list, section, "EnableCallerID", "", mdm_cid);
iniGetExistingString(list, section, "Init", "", mdm_init);
iniGetExistingString(list, section, "AutoAnswer", "", mdm_autoans);
iniGetExistingString(list, section, "Cleanup", "", mdm_cleanup);
iniGetExistingString(list, section, "EnableCallerID", "", mdm_cid);
mdm_timeout = iniGetInteger(list, section, "Timeout", mdm_timeout);
/* [TCP] Section */
section="TCP";
if(iniKeyExists(list, section, "Host"))
iniGetString(list, section, "Host", NULL, host);
iniGetExistingString(list, section, "Host", NULL, host);
port = iniGetShortInt(list, section, "Port", port);
tcp_nodelay = iniGetBool(list,section,"NODELAY", tcp_nodelay);
......@@ -1324,18 +1318,15 @@ void parse_ini_file(const char* ini_fname)
telnet = iniGetBool(list,section,"Enabled", telnet);
debug_telnet = iniGetBool(list,section,"Debug", debug_telnet);
telnet_advertise_cid = iniGetBool(list,section,"AdvertiseLocation", telnet_advertise_cid);
if(iniKeyExists(list, section, "TermType"))
iniGetString(list, section, "TermType", NULL, termtype);
if(iniKeyExists(list, section, "TermSpeed"))
iniGetString(list, section, "TermSpeed", NULL, termspeed);
iniGetExistingString(list, section, "TermType", NULL, termtype);
iniGetExistingString(list, section, "TermSpeed", NULL, termspeed);
/* [Ident] Section */
section="Ident";
ident = iniGetBool(list,section,"Enabled", ident);
ident_port = iniGetShortInt(list, section, "Port", ident_port);
ident_interface = iniGetIpAddress(list, section, "Interface", ident_interface);
if(iniKeyExists(list, section, "Response"))
iniGetString(list, section, "Response", NULL, ident_response);
iniGetExistingString(list, section, "Response", NULL, ident_response);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment