diff options
author | irungentoo <irungentoo@gmail.com> | 2013-08-01 16:52:25 -0700 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-08-01 16:52:25 -0700 |
commit | 4c949c5b13a3ebd80f4ab5d124036d99516bb41a (patch) | |
tree | 197748739d133d1b68ddce040bd935baefe1683d | |
parent | c6799c5fbec9a276bc6dafd837d7b0e808699c9a (diff) | |
parent | 67b7523b1876481fe4213ea301a7896e5af9fcb0 (diff) |
Merge pull request #252 from nickodell/master
Fix a bug and remove useless code.
-rw-r--r-- | testing/nTox.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/testing/nTox.c b/testing/nTox.c index de75d2ff..34d74d5a 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -89,7 +89,12 @@ char *format_message(char *message, int friendnum) | |||
89 | char* time = asctime(timeinfo); | 89 | char* time = asctime(timeinfo); |
90 | size_t len = strlen(time); | 90 | size_t len = strlen(time); |
91 | time[len-1] = '\0'; | 91 | time[len-1] = '\0'; |
92 | sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message); // timestamp | 92 | if (friendnum != -1) { |
93 | sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message); | ||
94 | } else { | ||
95 | // This message came from ourselves | ||
96 | sprintf(msg, "%s <%s> %s", time, name, message); | ||
97 | } | ||
93 | return msg; | 98 | return msg; |
94 | } | 99 | } |
95 | 100 | ||
@@ -316,17 +321,6 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length) | |||
316 | 321 | ||
317 | void print_message(int friendnumber, uint8_t * string, uint16_t length) | 322 | void print_message(int friendnumber, uint8_t * string, uint16_t length) |
318 | { | 323 | { |
319 | char name[MAX_NAME_LENGTH]; | ||
320 | getname(friendnumber, (uint8_t*)name); | ||
321 | char msg[100+length+strlen(name)+1]; | ||
322 | time_t rawtime; | ||
323 | struct tm * timeinfo; | ||
324 | time ( &rawtime ); | ||
325 | timeinfo = localtime ( &rawtime ); | ||
326 | char* temp = asctime(timeinfo); | ||
327 | size_t len = strlen(temp); | ||
328 | temp[len-1] = '\0'; | ||
329 | sprintf(msg, "[%d] %s <%s> %s", friendnumber, temp, name, string); // timestamp | ||
330 | new_lines(format_message((char*)string, friendnumber)); | 324 | new_lines(format_message((char*)string, friendnumber)); |
331 | } | 325 | } |
332 | 326 | ||