summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-07-31 04:33:51 -0700
committerirungentoo <irungentoo@gmail.com>2013-07-31 04:33:51 -0700
commit31d9af8e76b4ab60e3004ccb1a3cf47fdf88b5f9 (patch)
tree7d1712bf85eb39823bffd933a63fe95763bc3e7d
parent335fe2b86074e95ece814c94216695344f946309 (diff)
parent439de6fa3ab50bcb4c401d9175b643b6188786d3 (diff)
Merge pull request #205 from mhinz/fix-indent
Fix space/tab indentation
-rw-r--r--testing/DHT_cryptosendfiletest.c4
-rw-r--r--testing/nTox.c16
-rw-r--r--testing/toxic/prompt.c4
3 files changed, 12 insertions, 12 deletions
diff --git a/testing/DHT_cryptosendfiletest.c b/testing/DHT_cryptosendfiletest.c
index c7c33531..888dac0f 100644
--- a/testing/DHT_cryptosendfiletest.c
+++ b/testing/DHT_cryptosendfiletest.c
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
186 fclose(file2); 186 fclose(file2);
187 } 187 }
188 } 188 }
189 /* if buffer is empty and the connection timed out. */ 189 /* if buffer is empty and the connection timed out. */
190 else if(is_cryptoconnected(inconnection) == 4) { 190 else if(is_cryptoconnected(inconnection) == 4) {
191 crypto_kill(inconnection); 191 crypto_kill(inconnection);
192 } 192 }
@@ -209,7 +209,7 @@ int main(int argc, char *argv[])
209 fclose(file2); 209 fclose(file2);
210 } 210 }
211 } 211 }
212 /* if buffer is empty and the connection timed out. */ 212 /* if buffer is empty and the connection timed out. */
213 else if(is_cryptoconnected(connection) == 4) { 213 else if(is_cryptoconnected(connection) == 4) {
214 crypto_kill(connection); 214 crypto_kill(connection);
215 } 215 }
diff --git a/testing/nTox.c b/testing/nTox.c
index 5c560079..04ae55cd 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -72,13 +72,13 @@ void print_friendlist()
72 72
73char *format_message(char *message, int friendnum) 73char *format_message(char *message, int friendnum)
74{ 74{
75 char name[MAX_NAME_LENGTH]; 75 char name[MAX_NAME_LENGTH];
76 if(friendnum != -1) { 76 if(friendnum != -1) {
77 getname(friendnum, (uint8_t*)name); 77 getname(friendnum, (uint8_t*)name);
78 } else { 78 } else {
79 getself_name((uint8_t*)name); 79 getself_name((uint8_t*)name);
80 } 80 }
81 char *msg = malloc(100+strlen(message)+strlen(name)+1); 81 char *msg = malloc(100+strlen(message)+strlen(name)+1);
82 time_t rawtime; 82 time_t rawtime;
83 struct tm * timeinfo; 83 struct tm * timeinfo;
84 time ( &rawtime ); 84 time ( &rawtime );
@@ -129,7 +129,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
129 if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) { 129 if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
130 new_lines("[i] could not send message"); 130 new_lines("[i] could not send message");
131 } else { 131 } else {
132 new_lines(format_message(message, -1)); 132 new_lines(format_message(message, -1));
133 } 133 }
134 } 134 }
135 else if (line[1] == 'n') { 135 else if (line[1] == 'n') {
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 22d9eb9e..0cd10730 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -125,8 +125,8 @@ static void execute(ToxWindow* self, char* cmd) {
125 xx[2] = '\0'; 125 xx[2] = '\0';
126 126
127 if(sscanf(xx, "%02x", &x) != 1) { 127 if(sscanf(xx, "%02x", &x) != 1) {
128 wprintw(self->window, "Invalid ID.\n"); 128 wprintw(self->window, "Invalid ID.\n");
129 return; 129 return;
130 } 130 }
131 131
132 id_bin[i] = x; 132 id_bin[i] = x;