Fix Griffin build

This commit is contained in:
twinaphex 2017-11-28 02:52:26 +01:00
parent 130203c431
commit 013d2eba40

View File

@ -14,7 +14,7 @@
#include "portlistingparse.h" #include "portlistingparse.h"
static UNSIGNED_INTEGER static UNSIGNED_INTEGER
my_atoui(const char * s) my_custom_atoui(const char * s)
{ {
return s ? ((UNSIGNED_INTEGER)STRTOUI(s, NULL, 0)) : 0; return s ? ((UNSIGNED_INTEGER)STRTOUI(s, NULL, 0)) : 0;
} }
@ -38,7 +38,7 @@ UPNP_GetTotalBytesSent(const char * controlURL,
/*DisplayNameValueList(buffer, bufsize);*/ /*DisplayNameValueList(buffer, bufsize);*/
free(buffer); buffer = NULL; free(buffer); buffer = NULL;
p = GetValueFromNameValueList(&pdata, "NewTotalBytesSent"); p = GetValueFromNameValueList(&pdata, "NewTotalBytesSent");
r = (unsigned)my_atoui(p); r = (unsigned)my_custom_atoui(p);
ClearNameValueList(&pdata); ClearNameValueList(&pdata);
return r; return r;
} }
@ -62,7 +62,7 @@ UPNP_GetTotalBytesReceived(const char * controlURL,
/*DisplayNameValueList(buffer, bufsize);*/ /*DisplayNameValueList(buffer, bufsize);*/
free(buffer); buffer = NULL; free(buffer); buffer = NULL;
p = GetValueFromNameValueList(&pdata, "NewTotalBytesReceived"); p = GetValueFromNameValueList(&pdata, "NewTotalBytesReceived");
r = (unsigned)my_atoui(p); r = (unsigned)my_custom_atoui(p);
ClearNameValueList(&pdata); ClearNameValueList(&pdata);
return r; return r;
} }
@ -86,7 +86,7 @@ UPNP_GetTotalPacketsSent(const char * controlURL,
/*DisplayNameValueList(buffer, bufsize);*/ /*DisplayNameValueList(buffer, bufsize);*/
free(buffer); buffer = NULL; free(buffer); buffer = NULL;
p = GetValueFromNameValueList(&pdata, "NewTotalPacketsSent"); p = GetValueFromNameValueList(&pdata, "NewTotalPacketsSent");
r = (unsigned)my_atoui(p); r = (unsigned)my_custom_atoui(p);
ClearNameValueList(&pdata); ClearNameValueList(&pdata);
return r; return r;
} }
@ -110,7 +110,7 @@ UPNP_GetTotalPacketsReceived(const char * controlURL,
/*DisplayNameValueList(buffer, bufsize);*/ /*DisplayNameValueList(buffer, bufsize);*/
free(buffer); buffer = NULL; free(buffer); buffer = NULL;
p = GetValueFromNameValueList(&pdata, "NewTotalPacketsReceived"); p = GetValueFromNameValueList(&pdata, "NewTotalPacketsReceived");
r = (unsigned)my_atoui(p); r = (unsigned)my_custom_atoui(p);
ClearNameValueList(&pdata); ClearNameValueList(&pdata);
return r; return r;
} }
@ -903,11 +903,11 @@ UPNP_GetFirewallStatus(const char * controlURL,
if(ipa && fe) if(ipa && fe)
ret = UPNPCOMMAND_SUCCESS; ret = UPNPCOMMAND_SUCCESS;
if(fe) if(fe)
*firewallEnabled = (int)my_atoui(fe); *firewallEnabled = (int)my_custom_atoui(fe);
/*else /*else
*firewallEnabled = 0;*/ *firewallEnabled = 0;*/
if(ipa) if(ipa)
*inboundPinholeAllowed = (int)my_atoui(ipa); *inboundPinholeAllowed = (int)my_custom_atoui(ipa);
/*else /*else
*inboundPinholeAllowed = 0;*/ *inboundPinholeAllowed = 0;*/
p = GetValueFromNameValueList(&pdata, "errorCode"); p = GetValueFromNameValueList(&pdata, "errorCode");
@ -971,7 +971,7 @@ UPNP_GetOutboundPinholeTimeout(const char * controlURL, const char * servicetype
ret = UPNPCOMMAND_SUCCESS; ret = UPNPCOMMAND_SUCCESS;
p = GetValueFromNameValueList(&pdata, "OutboundPinholeTimeout"); p = GetValueFromNameValueList(&pdata, "OutboundPinholeTimeout");
if(p) if(p)
*opTimeout = (int)my_atoui(p); *opTimeout = (int)my_custom_atoui(p);
} }
ClearNameValueList(&pdata); ClearNameValueList(&pdata);
return ret; return ret;
@ -1175,7 +1175,7 @@ UPNP_CheckPinholeWorking(const char * controlURL, const char * servicetype,
p = GetValueFromNameValueList(&pdata, "IsWorking"); p = GetValueFromNameValueList(&pdata, "IsWorking");
if(p) if(p)
{ {
*isWorking = (int)my_atoui(p); *isWorking = (int)my_custom_atoui(p);
ret = UPNPCOMMAND_SUCCESS; ret = UPNPCOMMAND_SUCCESS;
} }
else else
@ -1222,7 +1222,7 @@ UPNP_GetPinholePackets(const char * controlURL, const char * servicetype,
p = GetValueFromNameValueList(&pdata, "PinholePackets"); p = GetValueFromNameValueList(&pdata, "PinholePackets");
if(p) if(p)
{ {
*packets = (int)my_atoui(p); *packets = (int)my_custom_atoui(p);
ret = UPNPCOMMAND_SUCCESS; ret = UPNPCOMMAND_SUCCESS;
} }