emdee/tox-weechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allocate Tox_Options statically.

Browse Source
This commit is contained in:
Håvard Pettersson 2014-10-11 13:56:34 +02:00
parent 124f764546
commit a437931e41
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/twc-profile.c
View File

@ -217,31 +217,30 @@ twc_profile_load(struct t_twc_profile *profile)
profile->name); profile->name);
// create Tox options object // create Tox options object
Tox_Options *options = malloc(sizeof(Tox_Options)); Tox_Options options;
options->proxy_enabled = options.proxy_enabled =
TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_PROXY_ENABLED); TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_PROXY_ENABLED);
const char *proxy_address = const char *proxy_address =
TWC_PROFILE_OPTION_STRING(profile, TWC_PROFILE_OPTION_PROXY_ADDRESS); TWC_PROFILE_OPTION_STRING(profile, TWC_PROFILE_OPTION_PROXY_ADDRESS);
if (proxy_address) if (proxy_address)
memcpy(options->proxy_address, proxy_address, strlen(proxy_address) + 1); memcpy(options.proxy_address, proxy_address, strlen(proxy_address) + 1);
options->proxy_port = options.proxy_port =
TWC_PROFILE_OPTION_INTEGER(profile, TWC_PROFILE_OPTION_PROXY_PORT); TWC_PROFILE_OPTION_INTEGER(profile, TWC_PROFILE_OPTION_PROXY_PORT);
options->udp_disabled = options.udp_disabled =
!TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_UDP); !TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_UDP);
options->ipv6enabled = options.ipv6enabled =
TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_IPV6); TWC_PROFILE_OPTION_BOOLEAN(profile, TWC_PROFILE_OPTION_IPV6);
if (options->proxy_enabled) if (options.proxy_enabled)
{ {
if (!options->proxy_address || !options->proxy_port) if (!options.proxy_address || !options.proxy_port)
{ {
weechat_printf(profile->buffer, weechat_printf(profile->buffer,
"%sproxy is enabled, but address or port is " "%sproxy is enabled, proxy information is "
"missing; aborting", "incomplete; aborting",
weechat_prefix("error"), weechat_prefix("error"));
options->proxy_address, options->proxy_port);
return; return;
} }
else else
@ -249,12 +248,12 @@ twc_profile_load(struct t_twc_profile *profile)
weechat_printf(profile->buffer, weechat_printf(profile->buffer,
"%susing proxy %s:%d", "%susing proxy %s:%d",
weechat_prefix("network"), weechat_prefix("network"),
options->proxy_address, options->proxy_port); options.proxy_address, options.proxy_port);
} }
} }
// create Tox // create Tox
profile->tox = tox_new(options); profile->tox = tox_new(&options);
if (!(profile->tox)) if (!(profile->tox))
{ {
weechat_printf(profile->buffer, weechat_printf(profile->buffer,