Merge pull request #161 from sureshsundriyal/wip

More coverity fixes.
pull/162/head
Suresh Sundriyal 9 years ago
commit 2ff4b0a8df

@ -126,14 +126,18 @@ static int vt_open(sqlite3_vtab *p_svt, sqlite3_vtab_cursor **pp_cursor)
vtab_cursor *p_cur = (vtab_cursor *)new vtab_cursor();
*pp_cursor = (sqlite3_vtab_cursor *)p_cur;
if (p_cur == NULL) {
return SQLITE_NOMEM;
} else {
*pp_cursor = (sqlite3_vtab_cursor *)p_cur;
p_cur->base.pVtab = p_svt;
p_cur->env_cursor = environ;
p_cur->base.pVtab = p_svt;
p_cur->env_cursor = environ;
vt_next((sqlite3_vtab_cursor *)p_cur);
vt_next((sqlite3_vtab_cursor *)p_cur);
}
return p_cur ? SQLITE_OK : SQLITE_NOMEM;
return SQLITE_OK;
}
static int vt_close(sqlite3_vtab_cursor *cur)

@ -284,7 +284,7 @@ public:
" Current Time: %s Original Time: %s Offset: %+d.%03d",
curr_timestamp,
old_timestamp,
(int)offset_tv.tv_sec, offset_tv.tv_usec / 1000);
(int)offset_tv.tv_sec, (int)(offset_tv.tv_usec / 1000));
this->fos_lines.push_back(log_time);
if (this->fos_log_helper.ldh_line_values.empty()) {

@ -207,7 +207,7 @@ void log_msg(lnav_log_level_t level, const char *src_file, int line_number,
localtm.tm_hour,
localtm.tm_min,
localtm.tm_sec,
curr_time.tv_usec / 1000,
(int)(curr_time.tv_usec / 1000),
LEVEL_NAMES[level],
basename((char *)src_file),
line_number);

Loading…
Cancel
Save