Diff between 8a03376544b046a84301847d1594f6c3674983ff and 05bad2b9f761d514a71596adb25a3119bbb35110

Changed Files

File Additions Deletions Status
test/l2test.c +4 -4 modified
test/rctest.c +4 -4 modified

Full Patch

diff --git a/test/l2test.c b/test/l2test.c
index c5b6efe..7f9f007 100644
--- a/test/l2test.c
+++ b/test/l2test.c
@@ -103,7 +103,7 @@ static char *filename = NULL;
 static int rfcmode = 0;
 static int master = 0;
 static int auth = 0;
-static int encrypt = 0;
+static int encr = 0;
 static int secure = 0;
 static int socktype = SOCK_SEQPACKET;
 static int linger = 0;
@@ -336,7 +336,7 @@ static int do_connect(char *svr)
 		opt |= L2CAP_LM_MASTER;
 	if (auth)
 		opt |= L2CAP_LM_AUTH;
-	if (encrypt)
+	if (encr)
 		opt |= L2CAP_LM_ENCRYPT;
 	if (secure)
 		opt |= L2CAP_LM_SECURE;
@@ -471,7 +471,7 @@ static void do_listen(void (*handler)(int sk))
 		opt |= L2CAP_LM_MASTER;
 	if (auth)
 		opt |= L2CAP_LM_AUTH;
-	if (encrypt)
+	if (encr)
 		opt |= L2CAP_LM_ENCRYPT;
 	if (secure)
 		opt |= L2CAP_LM_SECURE;
@@ -1404,7 +1404,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'E':
-			encrypt = 1;
+			encr = 1;
 			break;
 
 		case 'S':
diff --git a/test/rctest.c b/test/rctest.c
index 417cb3f..58aa533 100644
--- a/test/rctest.c
+++ b/test/rctest.c
@@ -80,7 +80,7 @@ static int save_fd = -1;
 
 static int master = 0;
 static int auth = 0;
-static int encrypt = 0;
+static int encr = 0;
 static int secure = 0;
 static int socktype = SOCK_STREAM;
 static int linger = 0;
@@ -205,7 +205,7 @@ static int do_connect(const char *svr)
 		opt |= RFCOMM_LM_MASTER;
 	if (auth)
 		opt |= RFCOMM_LM_AUTH;
-	if (encrypt)
+	if (encr)
 		opt |= RFCOMM_LM_ENCRYPT;
 	if (secure)
 		opt |= RFCOMM_LM_SECURE;
@@ -296,7 +296,7 @@ static void do_listen(void (*handler)(int sk))
 		opt |= RFCOMM_LM_MASTER;
 	if (auth)
 		opt |= RFCOMM_LM_AUTH;
-	if (encrypt)
+	if (encr)
 		opt |= RFCOMM_LM_ENCRYPT;
 	if (secure)
 		opt |= RFCOMM_LM_SECURE;
@@ -776,7 +776,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'E':
-			encrypt = 1;
+			encr = 1;
 			break;
 
 		case 'S':