fix warnings, and harmonize indentation

diff --git a/apps/ca.c b/apps/ca.c
index 22c9f820c561c60d388cca29bfa5a77bab8a6c15..4867f309c7a0645aa4c24d7083942ad15d52684b 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -3055,68 +3055,72 @@ X509_NAME *do_subject(char *subject, long chtype)
        int nid;
 
        if (!buf || !ne_types || !ne_values)
-       {
+               {
                BIO_printf(bio_err, "malloc error\n");
                goto error;
-       }
+               }       
 
        if (*subject != '/')
-       {
+               {
                BIO_printf(bio_err, "Subject does not start with '/'.\n");
                goto error;
-       }
+               }
        sp++; /* skip leading / */
 
        while (*sp)
-       {
+               {
                /* collect type */
                ne_types[ne_num] = bp;
                while (*sp)
-               {
+                       {
                        if (*sp == '\\') /* is there anything to escape in the type...? */
+                               {
                                if (*++sp)
                                        *bp++ = *sp++;
-                               else
-                               {
+                               else    
+                                       {
                                        BIO_printf(bio_err, "escape character at end of string\n");
                                        goto error;
-                               }
+                                       }
+                               }       
                        else if (*sp == '=')
-                       {
+                               {
                                sp++;
                                *bp++ = '\0';
                                break;
-                       }
+                               }
                        else
                                *bp++ = *sp++;
-               }
+                       }
                if (!*sp)
-               {
+                       {
                        BIO_printf(bio_err, "end of string encountered while processing type of subject name element #%d\n", ne_num);
                        goto error;
-               }
+                       }
                ne_values[ne_num] = bp;
                while (*sp)
-               {
+                       {
                        if (*sp == '\\')
+                               {
                                if (*++sp)
                                        *bp++ = *sp++;
                                else
-                               {
+                                       {
                                        BIO_printf(bio_err, "escape character at end of string\n");
                                        goto error;
+                                       }
                                }
                        else if (*sp == '/')
-                       {
+                               {
                                sp++;
                                break;
-                       }
+                               }
                        else
                                *bp++ = *sp++;
-               }
+                       }
                *bp++ = '\0';
                ne_num++;
-       }
+               }       
 
        if (!(n = X509_NAME_new()))
                goto error;