mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

Remove delete

Browse Source
This commit is contained in:
Carles Fernandez 2019-07-01 15:26:48 +02:00
parent 587ec66e78
commit 54553a8cff
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/libs/gnss_sdr_supl_client.cc
View File

@ -39,10 +39,10 @@
#include <glog/logging.h> #include <glog/logging.h>
#include <pugixml.hpp> #include <pugixml.hpp>
#include <cmath> // for pow #include <cmath> // for pow
#include <cstring> // for strcpy
#include <exception> // for exception #include <exception> // for exception
#include <iostream> // for cerr #include <iostream> // for cerr
#include <utility> // for pair #include <utility> // for pair
#include <vector>
Gnss_Sdr_Supl_Client::Gnss_Sdr_Supl_Client() Gnss_Sdr_Supl_Client::Gnss_Sdr_Supl_Client()
{ {
@ -173,14 +173,16 @@ int Gnss_Sdr_Supl_Client::get_assistance(int i_mcc, int i_mns, int i_lac, int i_
supl_set_gsm_cell(&ctx, mcc, mns, lac, ci); supl_set_gsm_cell(&ctx, mcc, mns, lac, ci);
// PERFORM SUPL COMMUNICATION // PERFORM SUPL COMMUNICATION
char* cstr = new char[server_name.length() + 1]; std::vector<char> cstr(server_name.length() + 1);
strcpy(cstr, server_name.c_str()); for (int i = 0; i != server_name.length(); ++i)
{
cstr[i] = static_cast<char>(server_name[i]);
}
int err; int err;
ctx.p.request = request; // select assistance info request from a pre-defined set ctx.p.request = request; // select assistance info request from a pre-defined set
//std::cout<<"mcc="<<mcc<<"mns="<<mns<<"lac="<<lac<<"ci="<<ci<<std::endl; err = supl_get_assist(&ctx, cstr.data(), &assist);
err = supl_get_assist(&ctx, cstr, &assist);
if (err == 0) if (err == 0)
{ {
read_supl_data(); read_supl_data();
@ -191,12 +193,11 @@ int Gnss_Sdr_Supl_Client::get_assistance(int i_mcc, int i_mns, int i_lac, int i_
else else
{ {
/* /*
* If supl_get_assist() fails, the connection remains open * If supl_get_assist() fails, the connection remains open
* and the memory/files are not released. * and the memory/files are not released.
*/ */
supl_close(&ctx); supl_close(&ctx);
} }
delete[] cstr;
return err; return err;
} }