Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 06:13:03 +01:00
Code Issues Projects Releases Wiki Activity

Manually merged changes by 1100110

Browse Source
This commit is contained in:
Sean Qureshi 2013-09-12 17:31:10 +00:00
parent d06581fe1d
commit 34fb7ba885
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat.c
View File

@ -324,7 +324,7 @@ static void execute(ToxWindow *self, ChatContext *ctx, StatusBar *statusbar, Tox
else if (!strcmp(cmd, "/myid")) { else if (!strcmp(cmd, "/myid")) {
char id[TOX_FRIEND_ADDRESS_SIZE * 2 + 1] = {'\0'}; char id[TOX_FRIEND_ADDRESS_SIZE * 2 + 1] = {'\0'};
int i; size_t i;
uint8_t address[TOX_FRIEND_ADDRESS_SIZE]; uint8_t address[TOX_FRIEND_ADDRESS_SIZE];
tox_getaddress(m, address); tox_getaddress(m, address);

11
src/prompt.c
View File

@ -87,7 +87,7 @@ void prompt_onFriendRequest(ToxWindow *prompt, uint8_t *key, uint8_t *data, uint
int n = add_req(key); int n = add_req(key);
wprintw(prompt->window, "\nFriend request from:\n"); wprintw(prompt->window, "\nFriend request from:\n");
int i; size_t i;
for (i = 0; i < KEY_SIZE_BYTES; ++i) { for (i = 0; i < KEY_SIZE_BYTES; ++i) {
wprintw(prompt->window, "%02x", key[i] & 0xff); wprintw(prompt->window, "%02x", key[i] & 0xff);
@ -121,7 +121,7 @@ unsigned char *hex_string_to_bin(char hex_string[])
} }
char *pos = hex_string; char *pos = hex_string;
int i; size_t i;
for (i = 0; i < len; ++i, pos += 2) for (i = 0; i < len; ++i, pos += 2)
sscanf(pos, "%2hhx", &val[i]); sscanf(pos, "%2hhx", &val[i]);
@ -168,7 +168,8 @@ void cmd_add(ToxWindow *self, Tox *m, int argc, char **argv)
char xx[3]; char xx[3];
uint32_t x; uint32_t x;
uint8_t *msg; uint8_t *msg;
int i, num; size_t i;
int num;
char *id = argv[1]; char *id = argv[1];
@ -477,7 +478,7 @@ static void execute(ToxWindow *self, Tox *m, char *u_cmd)
{ {
int newlines = 0; int newlines = 0;
char cmd[MAX_STR_SIZE] = {'\0'}; char cmd[MAX_STR_SIZE] = {'\0'};
int i; size_t i;
for (i = 0; i < strlen(prompt_buf); ++i) { for (i = 0; i < strlen(prompt_buf); ++i) {
if (u_cmd[i] == '\n') if (u_cmd[i] == '\n')
@ -595,7 +596,7 @@ static void prompt_onDraw(ToxWindow *self, Tox *m)
{ {
curs_set(1); curs_set(1);
int x, y; int x, y;
int i; size_t i;
getyx(self->window, y, x); getyx(self->window, y, x);
for (i = 0; i < (strlen(prompt_buf)); ++i) { for (i = 0; i < (strlen(prompt_buf)); ++i) {