Merge "memory management fixes"

This commit is contained in:
Linux Build Service Account 2015-08-21 08:44:24 -07:00 committed by Gerrit - the friendly Code Review server
commit 5501f7e1a2
2 changed files with 6 additions and 3 deletions

View file

@ -805,7 +805,10 @@ SIDE EFFECTS
static int loc_xtra_init(GpsXtraCallbacks* callbacks) static int loc_xtra_init(GpsXtraCallbacks* callbacks)
{ {
ENTRY_LOG(); ENTRY_LOG();
int ret_val = loc_eng_xtra_init(loc_afw_data, (GpsXtraExtCallbacks*)callbacks); GpsXtraExtCallbacks extCallbacks;
memset(&extCallbacks, 0, sizeof(extCallbacks));
extCallbacks.download_request_cb = callbacks->download_request_cb;
int ret_val = loc_eng_xtra_init(loc_afw_data, &extCallbacks);
EXIT_LOG(%d, ret_val); EXIT_LOG(%d, ret_val);
return ret_val; return ret_val;

View file

@ -52,8 +52,8 @@
*============================================================================*/ *============================================================================*/
/* Parameter data */ /* Parameter data */
static uint8_t DEBUG_LEVEL = 0xff; static uint32_t DEBUG_LEVEL = 0xff;
static uint8_t TIMESTAMP = 0; static uint32_t TIMESTAMP = 0;
/* Parameter spec table */ /* Parameter spec table */
static loc_param_s_type loc_param_table[] = static loc_param_s_type loc_param_table[] =