1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 15:03:27 +01:00

removed unneeded var, small fixes

This commit is contained in:
Jfreegman 2013-10-16 05:00:27 -04:00
parent 5f3293bfec
commit 958e77660e
3 changed files with 3 additions and 5 deletions

View File

@ -107,7 +107,7 @@ static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int num, uint8_t fil
ChatContext *ctx = (ChatContext *) self->chatwin; ChatContext *ctx = (ChatContext *) self->chatwin;
wprintw(ctx->history, "File transfer request for '%s' of size %llu.\n", pathname, wprintw(ctx->history, "File transfer request for '%s' (%llu bytes).\n", pathname,
(long long unsigned int)filesize); (long long unsigned int)filesize);
if (filenum > MAX_FILENUMBER) { if (filenum > MAX_FILENUMBER) {
@ -219,7 +219,6 @@ static void chat_sendfile(ToxWindow *self, ChatContext *ctx, Tox *m, uint8_t *pa
} }
memcpy(file_senders[num_file_senders].pathname, path, path_len + 1); memcpy(file_senders[num_file_senders].pathname, path, path_len + 1);
memcpy(file_senders[num_file_senders].friendname, friendname, strlen(friendname) + 1);
file_senders[num_file_senders].chatwin = ctx->history; file_senders[num_file_senders].chatwin = ctx->history;
file_senders[num_file_senders].file = file_to_send; file_senders[num_file_senders].file = file_to_send;
file_senders[num_file_senders].filenum = filenum; file_senders[num_file_senders].filenum = filenum;

View File

@ -347,7 +347,7 @@ static void load_data(Tox *m, char *path)
} }
} }
void chat_do_file_senders(Tox *m) void do_file_senders(Tox *m)
{ {
int i; int i;
@ -478,7 +478,7 @@ int main(int argc, char *argv[])
while (true) { while (true) {
do_tox(m, prompt); do_tox(m, prompt);
chat_do_file_senders(m); do_file_senders(m);
draw_active_window(m); draw_active_window(m);
} }

View File

@ -108,7 +108,6 @@ typedef struct {
uint8_t filenum; uint8_t filenum;
uint8_t nextpiece[FILE_PIECE_SIZE]; uint8_t nextpiece[FILE_PIECE_SIZE];
uint16_t piecelen; uint16_t piecelen;
uint8_t friendname[TOXIC_MAX_NAME_LENGTH];
uint8_t pathname[MAX_STR_SIZE]; uint8_t pathname[MAX_STR_SIZE];
} FileSender; } FileSender;