From ff2e04b107587e69096e1523bcf66b2f45cafd7a Mon Sep 17 00:00:00 2001 From: Nick ODell Date: Thu, 1 Aug 2013 16:15:25 -0600 Subject: Fix bug where messages from yourself were preceeded by [-1] --- testing/nTox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'testing/nTox.c') diff --git a/testing/nTox.c b/testing/nTox.c index f87a2a25..a2d8ade5 100644 --- a/testing/nTox.c +++ b/testing/nTox.c @@ -89,7 +89,12 @@ char *format_message(char *message, int friendnum) char* time = asctime(timeinfo); size_t len = strlen(time); time[len-1] = '\0'; - sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message); // timestamp + if (friendnum != -1) { + sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message); + } else { + // This message came from ourselves + sprintf(msg, "%s <%s> %s", time, name, message); + } return msg; } -- cgit v1.2.3 From 67b7523b1876481fe4213ea301a7896e5af9fcb0 Mon Sep 17 00:00:00 2001 From: Nick ODell Date: Thu, 1 Aug 2013 16:19:01 -0600 Subject: Remove code that did nothing. --- testing/nTox.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'testing/nTox.c') diff --git a/testing/nTox.c b/testing/nTox.c index a2d8ade5..0020e80e 100644 --- a/testing/nTox.c +++ b/testing/nTox.c @@ -318,17 +318,6 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length) void print_message(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]; - time_t rawtime; - struct tm * timeinfo; - time ( &rawtime ); - timeinfo = localtime ( &rawtime ); - char* temp = asctime(timeinfo); - size_t len = strlen(temp); - temp[len-1] = '\0'; - sprintf(msg, "[%d] %s <%s> %s", friendnumber, temp, name, string); // timestamp new_lines(format_message((char*)string, friendnumber)); } -- cgit v1.2.3