From 207c067cf22d65cdfc08e8659fb8dd575e248053 Mon Sep 17 00:00:00 2001 From: Stuart Banks Date: Wed, 31 Jul 2013 02:15:01 -0400 Subject: Clean up/format code --- testing/nTox.c | 153 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 78 insertions(+), 75 deletions(-) (limited to 'testing/nTox.c') diff --git a/testing/nTox.c b/testing/nTox.c index 5c560079..5f184407 100644 --- a/testing/nTox.c +++ b/testing/nTox.c @@ -23,9 +23,9 @@ #include "nTox.h" #include "misc_tools.h" - #include #include + #ifdef WIN32 #define c_sleep(x) Sleep(1*x) #else @@ -35,7 +35,7 @@ char lines[HISTORY][STRING_LENGTH]; char line[STRING_LENGTH]; -int x,y; +int x, y; uint8_t pending_requests[256][CLIENT_ID_SIZE]; uint8_t num_requests; @@ -44,9 +44,9 @@ void new_lines(char *line) { int i; for (i = HISTORY-1; i > 0; i--) - strcpy(lines[i],lines[i-1]); + strcpy(lines[i], lines[i-1]); - strcpy(lines[0],line); + strcpy(lines[0], line); do_refresh(); } @@ -54,10 +54,9 @@ void new_lines(char *line) void print_friendlist() { char name[MAX_NAME_LENGTH]; - uint32_t i; - new_lines("[i] Friend List:"); - for (i=0; i <= num_requests; i++) { + uint32_t i; + for (i = 0; i <= num_requests; i++) { char fstring[128]; getname(i, (uint8_t*)name); @@ -73,7 +72,7 @@ void print_friendlist() char *format_message(char *message, int friendnum) { char name[MAX_NAME_LENGTH]; - if(friendnum != -1) { + if (friendnum != -1) { getname(friendnum, (uint8_t*)name); } else { getself_name((uint8_t*)name); @@ -85,7 +84,7 @@ char *format_message(char *message, int friendnum) timeinfo = localtime ( &rawtime ); char* time = asctime(timeinfo); size_t len = strlen(time); - time[len-1]='\0'; + time[len-1] = '\0'; sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message); // timestamp return msg; } @@ -93,13 +92,14 @@ char *format_message(char *message, int friendnum) void line_eval(char lines[HISTORY][STRING_LENGTH], char *line) { if (line[0] == '/') { - char command[STRING_LENGTH + 2] = "> "; - strcat(command, line); - new_lines(command); - if (line[1] == 'f') { // add friend command: /f ID + char inpt_command = line[1]; + char prompt[STRING_LENGTH + 2] = "> "; + strcat(prompt, line); + new_lines(prompt); + if (inpt_command == 'f') { // add friend command: /f ID int i; char temp_id[128]; - for (i=0; i<128; i++) + for (i = 0; i < 128; i++) temp_id[i] = line[i+3]; int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo")); char numstring[100]; @@ -107,63 +107,63 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line) new_lines(numstring); do_refresh(); } - else if (line[1] == 'd') { + else if (inpt_command == 'd') { doMessenger(); } - else if (line[1] == 'm') { //message command: /m friendnumber messsage - int i; + else if (inpt_command == 'm') { //message command: /m friendnumber messsage size_t len = strlen(line); char numstring[len-3]; char message[len-3]; - for (i=0; i> "); printw(line); @@ -298,12 +297,13 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length) timeinfo = localtime ( &rawtime ); char* temp = asctime(timeinfo); size_t len = strlen(temp); - temp[len-1]='\0'; + temp[len-1] = '\0'; sprintf(msg, "[%d] %s <%s> %s", friendnumber, temp, name, string); // timestamp new_lines(format_message((char*)string, friendnumber)); } -void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) { +void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) +{ char name[MAX_NAME_LENGTH]; getname(friendnumber, (uint8_t*)name); char msg[100+length]; @@ -311,7 +311,8 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) { new_lines(msg); } -void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) { +void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) +{ char name[MAX_NAME_LENGTH]; getname(friendnumber, (uint8_t*)name); char msg[100+length+strlen(name)+1]; @@ -319,15 +320,17 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) { new_lines(msg); } -void load_key(){ +void load_key() +{ FILE *data_file = NULL; - if ((data_file = fopen("data","r"))) { + data_file = fopen("data","r"); + if (data_file) { //load keys fseek(data_file, 0, SEEK_END); int size = ftell(data_file); fseek(data_file, 0, SEEK_SET); uint8_t data[size]; - if(fread(data, sizeof(uint8_t), size, data_file) != size){ + if (fread(data, sizeof(uint8_t), size, data_file) != size){ printf("[i] could not read data file\n[i] exiting\n"); exit(1); } @@ -338,7 +341,7 @@ void load_key(){ uint8_t data[size]; Messenger_save(data); data_file = fopen("data","w"); - if(fwrite(data, sizeof(uint8_t), size, data_file) != size){ + if (fwrite(data, sizeof(uint8_t), size, data_file) != size){ printf("[i] could not write data file\n[i] exiting\n"); exit(1); } @@ -368,26 +371,27 @@ int main(int argc, char *argv[]) m_callback_namechange(print_nickchange); m_callback_userstatus(print_statuschange); char idstring0[200]; - char idstring1[32][5]; - char idstring2[32][5]; - uint32_t i; - for(i = 0; i < 32; i++) + char idstring1[PUB_KEY_BYTES][5]; + char idstring2[PUB_KEY_BYTES][5]; + int i; + for(i = 0; i < PUB_KEY_BYTES; i++) { - if(self_public_key[i] < 16) + if (self_public_key[i] < (PUB_KEY_BYTES / 2)) strcpy(idstring1[i],"0"); else strcpy(idstring1[i], ""); sprintf(idstring2[i], "%hhX",self_public_key[i]); } strcpy(idstring0,"[i] your ID: "); - for (i=0; i<32; i++) { - strcat(idstring0,idstring1[i]); - strcat(idstring0,idstring2[i]); + int j; + for (j = 0; j < PUB_KEY_BYTES; j++) { + strcat(idstring0,idstring1[j]); + strcat(idstring0,idstring2[j]); } initscr(); noecho(); raw(); - getmaxyx(stdscr,y,x); + getmaxyx(stdscr, y, x); new_lines(idstring0); new_lines("[i] commands: /f ID (to add friend), /m friendnumber message (to send message), /s status (to change status)"); new_lines("[i] /l list (list friends), /h for help, /i for info, /n nick (to change nickname), /q (to quit)"); @@ -413,7 +417,6 @@ int main(int argc, char *argv[]) do_refresh(); c = getch(); - if (c == ERR || c == 27) continue; @@ -422,7 +425,7 @@ int main(int argc, char *argv[]) line_eval(lines, line); strcpy(line, ""); } else if (c == 127) { - line[strlen(line) - 1] = '\0'; + line[strlen(line)-1] = '\0'; } else if (isalnum(c) || ispunct(c) || c == ' ') { strcpy(line, appender(line, (char) c)); } -- cgit v1.2.3 From 17e64b3ee50605cbc15f195f770dacf31039e121 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Wed, 31 Jul 2013 05:52:08 -0400 Subject: initialize num_requests --- testing/nTox.c | 3 ++- testing/nTox_win32.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'testing/nTox.c') diff --git a/testing/nTox.c b/testing/nTox.c index 5f184407..54f973d0 100644 --- a/testing/nTox.c +++ b/testing/nTox.c @@ -38,7 +38,7 @@ char line[STRING_LENGTH]; int x, y; uint8_t pending_requests[256][CLIENT_ID_SIZE]; -uint8_t num_requests; +uint8_t num_requests = 0; void new_lines(char *line) { @@ -57,6 +57,7 @@ void print_friendlist() new_lines("[i] Friend List:"); uint32_t i; for (i = 0; i <= num_requests; i++) { + printf ("num_resusts: %d\n", num_requests); char fstring[128]; getname(i, (uint8_t*)name); diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c index 3286bb3a..27ab6a77 100644 --- a/testing/nTox_win32.c +++ b/testing/nTox_win32.c @@ -27,7 +27,7 @@ #include uint8_t pending_requests[256][CLIENT_ID_SIZE]; -uint8_t num_requests; +uint8_t num_requests = 0; char line[STRING_LENGTH]; char users_id[200]; -- cgit v1.2.3