Removed strcpy calls

This commit is contained in:
James Booth
2014-04-02 21:01:20 +01:00
parent e1db531875
commit a720ef2627
8 changed files with 31 additions and 34 deletions

View File

@@ -869,18 +869,15 @@ static void
_ui_print_system_msg_from_recipient(const char * const from, const char *message)
{
int num = 0;
char from_cpy[strlen(from) + 1];
char *bare_jid;
if (from == NULL || message == NULL)
return;
strcpy(from_cpy, from);
bare_jid = strtok(from_cpy, "/");
Jid *jid = jid_create(from);
ProfWin *window = wins_get_by_recipient(bare_jid);
ProfWin *window = wins_get_by_recipient(jid->barejid);
if (window == NULL) {
window = wins_new(bare_jid, WIN_CHAT);
window = wins_new(jid->barejid, WIN_CHAT);
if (window != NULL) {
num = wins_get_num(window);
status_bar_active(num);
@@ -892,12 +889,14 @@ _ui_print_system_msg_from_recipient(const char * const from, const char *message
}
win_print_time(window, '-');
wprintw(window->win, "*%s %s\n", bare_jid, message);
wprintw(window->win, "*%s %s\n", jid->barejid, message);
// this is the current window
if (wins_is_current(window)) {
wins_update_virtual_current();
}
jid_destroy(jid);
}
static void

View File

@@ -226,7 +226,7 @@ static void
_inp_replace_input(char *input, const char * const new_input, int *size)
{
int display_size;
strcpy(input, new_input);
strncpy(input, new_input, INP_WIN_MAX);
*size = strlen(input);
display_size = g_utf8_strlen(input, *size);
inp_win_reset();

View File

@@ -193,14 +193,14 @@ _notify(const char * const message, int timeout,
nid.uVersion = NOTIFYICON_VERSION;
//nid.uCallbackMessage = WM_MYMESSAGE;
nid.hIcon = LoadIcon(NULL, IDI_APPLICATION);
strcpy(nid.szTip, "Tray Icon");
strncpy(nid.szTip, "Tray Icon", 10);
nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
Shell_NotifyIcon(NIM_ADD, &nid);
// For a Ballon Tip
nid.uFlags = NIF_INFO;
strcpy(nid.szInfoTitle, "Profanity"); // Title
strcpy(nid.szInfo, message); // Copy Tip
strncpy(nid.szInfoTitle, "Profanity", 10); // Title
strncpy(nid.szInfo, message, 256); // Copy Tip
nid.uTimeout = timeout; // 3 Seconds
nid.dwInfoFlags = NIIF_INFO;

View File

@@ -277,8 +277,7 @@ _status_bar_print_message(const char * const msg)
if (message != NULL) {
free(message);
}
message = (char *) malloc(strlen(msg) + 1);
strcpy(message, msg);
message = strdup(msg);
mvwprintw(status_bar, 0, 10, message);
int cols = getmaxx(stdscr);