Merged origin/release (checked in because wanted to merge new stuff)

1 files changed, 40 insertions, 31 deletions

diff --git a/openssl/test/dummytest.c b/openssl/test/dummytest.c
index 5b4467e04..554acc221 100644
--- a/openssl/test/dummytest.c
+++ b/openssl/test/dummytest.c
@@ -7,42 +7,51 @@
 #include <openssl/crypto.h>
 
 int main(int argc, char *argv[])
-	{
-	char *p, *q = 0, *program;
+{
+    char *p, *q = 0, *program;
 
-	p = strrchr(argv[0], '/');
-	if (!p) p = strrchr(argv[0], '\\');
+    p = strrchr(argv[0], '/');
+    if (!p)
+        p = strrchr(argv[0], '\\');
 #ifdef OPENSSL_SYS_VMS
-	if (!p) p = strrchr(argv[0], ']');
-	if (p) q = strrchr(p, '>');
-	if (q) p = q;
-	if (!p) p = strrchr(argv[0], ':');
-	q = 0;
+    if (!p)
+        p = strrchr(argv[0], ']');
+    if (p)
+        q = strrchr(p, '>');
+    if (q)
+        p = q;
+    if (!p)
+        p = strrchr(argv[0], ':');
+    q = 0;
 #endif
-	if (p) p++;
-	if (!p) p = argv[0];
-	if (p) q = strchr(p, '.');
-	if (p && !q) q = p + strlen(p);
+    if (p)
+        p++;
+    if (!p)
+        p = argv[0];
+    if (p)
+        q = strchr(p, '.');
+    if (p && !q)
+        q = p + strlen(p);
 
-	if (!p)
-		program = BUF_strdup("(unknown)");
-	else
-		{
-		program = OPENSSL_malloc((q - p) + 1);
-		strncpy(program, p, q - p);
-		program[q - p] = '\0';
-		}
+    if (!p)
+        program = BUF_strdup("(unknown)");
+    else {
+        program = OPENSSL_malloc((q - p) + 1);
+        strncpy(program, p, q - p);
+        program[q - p] = '\0';
+    }
 
-	for(p = program; *p; p++)
-		if (islower((unsigned char)(*p)))
-			*p = toupper((unsigned char)(*p));
+    for (p = program; *p; p++)
+        if (islower((unsigned char)(*p)))
+            *p = toupper((unsigned char)(*p));
 
-	q = strstr(program, "TEST");
-	if (q > p && q[-1] == '_') q--;
-	*q = '\0';
+    q = strstr(program, "TEST");
+    if (q > p && q[-1] == '_')
+        q--;
+    *q = '\0';
 
-	printf("No %s support\n", program);
+    printf("No %s support\n", program);
 
-	OPENSSL_free(program);
-	return(0);
-	}
+    OPENSSL_free(program);
+    return (0);
+}