Fixed cppcheck warnings

This commit is contained in:
James Booth
2014-04-26 00:36:36 +01:00
parent ab4ea80a70
commit d6e92f62dc
26 changed files with 41 additions and 206 deletions

View File

@@ -643,7 +643,6 @@ static void
_cons_show_bookmarks(const GList *list)
{
ProfWin *console = wins_get_console();
Bookmark *item;
if (list == NULL) {
cons_show("");
@@ -654,7 +653,7 @@ _cons_show_bookmarks(const GList *list)
/* TODO: show status (connected or not) and window number */
while (list != NULL) {
item = list->data;
Bookmark *item = list->data;
win_print_time(console, '-');
wprintw(console->win, " %s", item->jid);

View File

@@ -1050,8 +1050,6 @@ _ui_current_page_off(void)
static void
_ui_print_system_msg_from_recipient(const char * const from, const char *message)
{
int num = 0;
if (from == NULL || message == NULL)
return;
@@ -1059,6 +1057,7 @@ _ui_print_system_msg_from_recipient(const char * const from, const char *message
ProfWin *window = wins_get_by_recipient(jid->barejid);
if (window == NULL) {
int num = 0;
window = wins_new(jid->barejid, WIN_CHAT);
if (window != NULL) {
num = wins_get_num(window);

View File

@@ -109,8 +109,6 @@ inp_block(void)
wint_t
inp_get_char(char *input, int *size)
{
int inp_x = 0;
int i;
wint_t ch;
int display_size = 0;
@@ -148,7 +146,7 @@ inp_get_char(char *input, int *size)
return ERR;
}
inp_x = getcurx(inp_win);
int inp_x = getcurx(inp_win);
// handle insert if not at end of input
if (inp_x < display_size) {
@@ -160,6 +158,7 @@ inp_get_char(char *input, int *size)
for (offset = &input[*size - 1]; offset >= next_ch; offset--) {
*(offset + utf_len) = *offset;
}
int i;
for (i = 0; i < utf_len; i++) {
*(next_ch + i) = bytes[i];
}
@@ -181,6 +180,7 @@ inp_get_char(char *input, int *size)
// wcrtomb can return (size_t) -1
if (utf_len < MB_CUR_MAX) {
int i;
for (i = 0 ; i < utf_len; i++) {
input[(*size)++] = bytes[i];
}
@@ -709,4 +709,4 @@ _printable(const wint_t ch)
bytes[utf_len] = '\0';
gunichar unichar = g_utf8_get_char(bytes);
return g_unichar_isprint(unichar) && (ch != KEY_MOUSE);
}
}

View File

@@ -64,7 +64,6 @@ win_free(ProfWin* window)
delwin(window->win);
free(window->from);
free(window);
window = NULL;
}
void