mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-01-11 06:43:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] main: move config free into new config_free method

Browse source
This commit is contained in:
Geoffrey McRae 2019-03-30 16:00:47 +11:00
parent 4dee965fdf
commit d6805cfa0f
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
a12-133-g35094a57cb+1 a12-134-g4dee965fdf+1

15
client/src/config.c
View file

@ -337,6 +337,21 @@ bool config_load(int argc, char * argv[])
return true; return true;
} }
void config_free()
{
free(params.shmFile );
free(params.spiceHost );
free(params.windowTitle);
for(unsigned int i = 0; i < LG_RENDERER_COUNT; ++i)
{
RendererOpts * opts = &params.rendererOpts[i];
for(unsigned int j = 0; j < opts->argc; ++j)
free(opts->argv[j].value);
free(opts->argv);
}
}
static bool load(const char * configFile) static bool load(const char * configFile)
{ {
config_t cfg; config_t cfg;

3
client/src/config.h
View file

@ -19,4 +19,5 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <stdbool.h> #include <stdbool.h>
bool config_load(int argc, char * argv[]); bool config_load(int argc, char * argv[]);
void config_free();

11
client/src/main.c
View file

@ -1303,15 +1303,6 @@ int main(int argc, char * argv[])
const int ret = run(); const int ret = run();
release_key_binds(); release_key_binds();
free(params.shmFile); config_free();
free(params.spiceHost);
for(unsigned int i = 0; i < LG_RENDERER_COUNT; ++i)
{
RendererOpts * opts = &params.rendererOpts[i];
for(unsigned int j = 0; j < opts->argc; ++j)
free(opts->argv[j].value);
free(opts->argv);
}
return ret; return ret;
} }