Bug 1251185, NSS clang-format: else line-break fixes, r=ttaubertNSS_3_23_BETA7

4 files changed, 56 insertions, 106 deletions

diff --git a/lib/dev/ckhelper.c b/lib/dev/ckhelper.c
index f58594228..4f3972653 100644
--- a/lib/dev/ckhelper.c
+++ b/lib/dev/ckhelper.c
@@ -145,8 +145,7 @@ loser:
         if (arenaOpt) {
             /* release all arena memory allocated before the failure. */
             (void)nssArena_Release(arenaOpt, mark);
-        }
-        else {
+        } else {
             CK_ULONG j;
             /* free each heap object that was allocated before the failure. */
             for (j = 0; j < i; j++) {
@@ -222,8 +221,7 @@ nssCKObject_SetAttributes(
     nssSession_ExitMonitor(session);
     if (ckrv == CKR_OK) {
         return PR_SUCCESS;
-    }
-    else {
+    } else {
         return PR_FAILURE;
     }
 }
@@ -311,10 +309,8 @@ nssCryptokiCertificate_GetAttributes(
                                                 cert_template, template_size);
     if (status != PR_SUCCESS) {
 
-        session = sessionOpt ?
-                             sessionOpt
-                             :
-                             nssToken_GetDefaultSession(certObject->token);
+        session = sessionOpt ? sessionOpt
+                             : nssToken_GetDefaultSession(certObject->token);
         if (!session) {
             nss_SetError(NSS_ERROR_INVALID_ARGUMENT);
             return PR_FAILURE;
@@ -429,10 +425,8 @@ nssCryptokiTrust_GetAttributes(
                                                 CKO_NSS_TRUST,
                                                 trust_template, trust_size);
     if (status != PR_SUCCESS) {
-        session = sessionOpt ?
-                             sessionOpt
-                             :
-                             nssToken_GetDefaultSession(trustObject->token);
+        session = sessionOpt ? sessionOpt
+                             : nssToken_GetDefaultSession(trustObject->token);
         if (!session) {
             nss_SetError(NSS_ERROR_INVALID_ARGUMENT);
             return PR_FAILURE;
@@ -503,10 +497,8 @@ nssCryptokiCRL_GetAttributes(
                                                 CKO_NSS_CRL,
                                                 crl_template, crl_size);
     if (status != PR_SUCCESS) {
-        session = sessionOpt ?
-                             sessionOpt
-                             :
-                             nssToken_GetDefaultSession(crlObject->token);
+        session = sessionOpt ? sessionOpt
+                             : nssToken_GetDefaultSession(crlObject->token);
         if (session == NULL) {
             nss_SetError(NSS_ERROR_INVALID_ARGUMENT);
             return PR_FAILURE;
@@ -575,11 +567,9 @@ nssCryptokiPrivateKey_SetCertificate(
             return PR_FAILURE;
         }
         session = sessionOpt;
-    }
-    else if (defaultSession && nssSession_IsReadWrite(defaultSession)) {
+    } else if (defaultSession && nssSession_IsReadWrite(defaultSession)) {
         session = defaultSession;
-    }
-    else {
+    } else {
         NSSSlot *slot = nssToken_GetSlot(token);
         session = nssSlot_CreateSession(token->slot, NULL, PR_TRUE);
         nssSlot_Destroy(slot);
diff --git a/lib/dev/ckhelper.h b/lib/dev/ckhelper.h
index a2927f8cb..169fc207d 100644
--- a/lib/dev/ckhelper.h
+++ b/lib/dev/ckhelper.h
@@ -68,8 +68,7 @@ NSS_EXTERN_DATA const NSSItem g_ck_class_privkey;
     if ((CK_LONG)(attrib)->ulValueLen > 0) {           \
         (item)->data = (void *)(attrib)->pValue;       \
         (item)->size = (PRUint32)(attrib)->ulValueLen; \
-    }                                                  \
-    else {                                             \
+    } else {                                           \
         (item)->data = 0;                              \
         (item)->size = 0;                              \
     }
@@ -78,8 +77,7 @@ NSS_EXTERN_DATA const NSSItem g_ck_class_privkey;
     if ((attrib)->ulValueLen > 0) {                       \
         if (*((CK_BBOOL *)(attrib)->pValue) == CK_TRUE) { \
             boolvar = PR_TRUE;                            \
-        }                                                 \
-        else {                                            \
+        } else {                                          \
             boolvar = PR_FALSE;                           \
         }                                                 \
     }
diff --git a/lib/dev/devtoken.c b/lib/dev/devtoken.c
index ded7b51d6..0adbca8bc 100644
--- a/lib/dev/devtoken.c
+++ b/lib/dev/devtoken.c
@@ -135,8 +135,7 @@ nssToken_DeleteStoredObject(
         if (token->defaultSession &&
             nssSession_IsReadWrite(token->defaultSession)) {
             session = token->defaultSession;
-        }
-        else {
+        } else {
             session = nssSlot_CreateSession(token->slot, NULL, PR_TRUE);
             createdSession = PR_TRUE;
         }
@@ -180,17 +179,14 @@ import_object(
                 return NULL;
             }
             session = sessionOpt;
-        }
-        else if (tok->defaultSession &&
-                 nssSession_IsReadWrite(tok->defaultSession)) {
+        } else if (tok->defaultSession &&
+                   nssSession_IsReadWrite(tok->defaultSession)) {
             session = tok->defaultSession;
-        }
-        else {
+        } else {
             session = nssSlot_CreateSession(tok->slot, NULL, PR_TRUE);
             createdSession = PR_TRUE;
         }
-    }
-    else {
+    } else {
         session = (sessionOpt) ? sessionOpt : tok->defaultSession;
     }
     if (session == NULL) {
@@ -204,8 +200,7 @@ import_object(
     nssSession_ExitMonitor(session);
     if (ckrv == CKR_OK) {
         object = nssCryptokiObject_Create(tok, session, handle);
-    }
-    else {
+    } else {
         nss_SetError(ckrv);
         nss_SetError(NSS_ERROR_PKCS11);
     }
@@ -268,15 +263,13 @@ find_objects(
     /* the arena is only for the array of object handles */
     if (maximumOpt > 0) {
         arraySize = maximumOpt;
-    }
-    else {
+    } else {
         arraySize = OBJECT_STACK_SIZE;
     }
     numHandles = 0;
     if (arraySize <= OBJECT_STACK_SIZE) {
         objectHandles = staticObjects;
-    }
-    else {
+    } else {
         objectHandles = nss_ZNEWARRAY(NULL, CK_OBJECT_HANDLE, arraySize);
     }
     if (!objectHandles) {
@@ -318,8 +311,7 @@ find_objects(
                 PORT_Memcpy(objectHandles, staticObjects,
                             OBJECT_STACK_SIZE * sizeof(objectHandles[1]));
             }
-        }
-        else {
+        } else {
             objectHandles = nss_ZREALLOCARRAY(objectHandles,
                                               CK_OBJECT_HANDLE,
                                               arraySize);
@@ -338,8 +330,7 @@ find_objects(
     if (numHandles > 0) {
         objects = create_objects_from_handles(tok, session,
                                               objectHandles, numHandles);
-    }
-    else {
+    } else {
         nss_SetError(NSS_ERROR_NOT_FOUND);
         objects = NULL;
     }
@@ -368,8 +359,7 @@ loser:
         nss_SetError(NSS_ERROR_NOT_FOUND);
         if (statusOpt)
             *statusOpt = PR_SUCCESS;
-    }
-    else {
+    } else {
         nss_SetError(ckrv);
         nss_SetError(NSS_ERROR_PKCS11);
         if (statusOpt)
@@ -463,16 +453,14 @@ nssToken_ImportCertificate(
     }
     if (certType == NSSCertificateType_PKIX) {
         cert_type = CKC_X_509;
-    }
-    else {
+    } else {
         return (nssCryptokiObject *)NULL;
     }
     NSS_CK_TEMPLATE_START(cert_tmpl, attr, ctsize);
     if (asTokenObject) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
         searchType = nssTokenSearchType_TokenOnly;
-    }
-    else {
+    } else {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
         searchType = nssTokenSearchType_SessionOnly;
     }
@@ -546,8 +534,7 @@ nssToken_ImportCertificate(
         }
         nssSession_Destroy(session);
         nssSlot_Destroy(slot);
-    }
-    else {
+    } else {
         /* Import the certificate onto the token */
         rvObject = import_object(tok, sessionOpt, cert_tmpl, ctsize);
     }
@@ -582,9 +569,8 @@ nssToken_FindObjects(
     /* Set the search to token/session only if provided */
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly ||
-             searchType == nssTokenSearchType_TokenForced) {
+    } else if (searchType == nssTokenSearchType_TokenOnly ||
+               searchType == nssTokenSearchType_TokenForced) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_SET_ATTRIBUTE_VAR(attr, CKA_CLASS, objclass);
@@ -594,8 +580,7 @@ nssToken_FindObjects(
         objects = find_objects(token, sessionOpt,
                                obj_template, obj_size,
                                maximumOpt, statusOpt);
-    }
-    else {
+    } else {
         objects = find_objects_by_template(token, sessionOpt,
                                            obj_template, obj_size,
                                            maximumOpt, statusOpt);
@@ -620,8 +605,7 @@ nssToken_FindCertificatesBySubject(
     /* Set the search to token/session only if provided */
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly) {
+    } else if (searchType == nssTokenSearchType_TokenOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_cert);
@@ -652,8 +636,7 @@ nssToken_FindCertificatesByNickname(
     /* Set the search to token/session only if provided */
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly) {
+    } else if (searchType == nssTokenSearchType_TokenOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_cert);
@@ -701,8 +684,7 @@ nssToken_FindCertificatesByEmail(
     /* Set the search to token/session only if provided */
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly) {
+    } else if (searchType == nssTokenSearchType_TokenOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_cert);
@@ -744,8 +726,7 @@ nssToken_FindCertificatesByID(
     /* Set the search to token/session only if provided */
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly) {
+    } else if (searchType == nssTokenSearchType_TokenOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_cert);
@@ -825,9 +806,8 @@ nssToken_FindCertificateByIssuerAndSerialNumber(
     /* Set the search to token/session only if provided */
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if ((searchType == nssTokenSearchType_TokenOnly) ||
-             (searchType == nssTokenSearchType_TokenForced)) {
+    } else if ((searchType == nssTokenSearchType_TokenOnly) ||
+               (searchType == nssTokenSearchType_TokenForced)) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     /* Set the unique id */
@@ -841,8 +821,7 @@ nssToken_FindCertificateByIssuerAndSerialNumber(
         objects = find_objects(token, sessionOpt,
                                cert_template, ctsize,
                                1, statusOpt);
-    }
-    else {
+    } else {
         objects = find_objects_by_template(token, sessionOpt,
                                            cert_template, ctsize,
                                            1, statusOpt);
@@ -869,8 +848,7 @@ nssToken_FindCertificateByIssuerAndSerialNumber(
             objects = find_objects(token, sessionOpt,
                                    cert_template, ctsize,
                                    1, statusOpt);
-        }
-        else {
+        } else {
             objects = find_objects_by_template(token, sessionOpt,
                                                cert_template, ctsize,
                                                1, statusOpt);
@@ -900,8 +878,7 @@ nssToken_FindCertificateByEncodedCertificate(
     /* Set the search to token/session only if provided */
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly) {
+    } else if (searchType == nssTokenSearchType_TokenOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_cert);
@@ -935,8 +912,7 @@ nssToken_FindPrivateKeys(
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_privkey);
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly) {
+    } else if (searchType == nssTokenSearchType_TokenOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_TEMPLATE_FINISH(key_template, attr, ktsize);
@@ -1094,8 +1070,7 @@ nssToken_ImportTrust(
     NSS_CK_TEMPLATE_START(trust_tmpl, attr, tsize);
     if (asTokenObject) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
-    }
-    else {
+    } else {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
     }
     NSS_CK_SET_ATTRIBUTE_VAR(attr, CKA_CLASS, tobjc);
@@ -1111,8 +1086,7 @@ nssToken_ImportTrust(
     if (stepUpApproved) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TRUST_STEP_UP_APPROVED,
                                   &g_ck_true);
-    }
-    else {
+    } else {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TRUST_STEP_UP_APPROVED,
                                   &g_ck_false);
     }
@@ -1185,8 +1159,7 @@ nssToken_ImportCRL(
     NSS_CK_TEMPLATE_START(crl_tmpl, attr, crlsize);
     if (asTokenObject) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
-    }
-    else {
+    } else {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
     }
     NSS_CK_SET_ATTRIBUTE_VAR(attr, CKA_CLASS, crlobjc);
@@ -1195,8 +1168,7 @@ nssToken_ImportCRL(
     NSS_CK_SET_ATTRIBUTE_UTF8(attr, CKA_NSS_URL, url);
     if (isKRL) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_NSS_KRL, &g_ck_true);
-    }
-    else {
+    } else {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_NSS_KRL, &g_ck_false);
     }
     NSS_CK_TEMPLATE_FINISH(crl_tmpl, attr, crlsize);
@@ -1235,9 +1207,8 @@ nssToken_FindCRLsBySubject(
     NSS_CK_TEMPLATE_START(crlobj_template, attr, crlobj_size);
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly ||
-             searchType == nssTokenSearchType_TokenForced) {
+    } else if (searchType == nssTokenSearchType_TokenOnly ||
+               searchType == nssTokenSearchType_TokenForced) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_SET_ATTRIBUTE_VAR(attr, CKA_CLASS, crlobjc);
@@ -1488,9 +1459,8 @@ nssToken_TraverseCertificates(
     NSS_CK_TEMPLATE_START(cert_template, attr, ctsize);
     if (searchType == nssTokenSearchType_SessionOnly) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_false);
-    }
-    else if (searchType == nssTokenSearchType_TokenOnly ||
-             searchType == nssTokenSearchType_TokenForced) {
+    } else if (searchType == nssTokenSearchType_TokenOnly ||
+               searchType == nssTokenSearchType_TokenForced) {
         NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_TOKEN, &g_ck_true);
     }
     NSS_CK_SET_ATTRIBUTE_ITEM(attr, CKA_CLASS, &g_ck_class_cert);
diff --git a/lib/dev/devutil.c b/lib/dev/devutil.c
index 980aa2852..b8f82c810 100644
--- a/lib/dev/devutil.c
+++ b/lib/dev/devutil.c
@@ -173,7 +173,7 @@ nssCryptokiObjectArray_Destroy(
 /* object cache for token */
 
 typedef struct
-    {
+{
     NSSArena *arena;
     nssCryptokiObject *object;
     CK_ATTRIBUTE_PTR attributes;
@@ -315,8 +315,7 @@ create_object_array(
         *doObjects = PR_FALSE;
         *status = PR_FAILURE;
         *numObjects = 0;
-    }
-    else {
+    } else {
         rvOandA = nss_ZNEWARRAY(NULL,
                                 nssCryptokiObjectAndAttributes *,
                                 *numObjects + 1);
@@ -437,16 +436,14 @@ search_for_objects(
             /* Either no state change, or went from !logged in -> logged in */
             cache->loggedIn = PR_TRUE;
             doSearch = PR_TRUE;
-        }
-        else {
+        } else {
             if (cache->loggedIn) {
                 /* went from logged in -> !logged in, destroy cached objects */
                 clear_cache(cache);
                 cache->loggedIn = PR_FALSE;
             } /* else no state change, still not logged in, so exit */
         }
-    }
-    else {
+    } else {
         /* slot is friendly, thus always available for search */
         doSearch = PR_TRUE;
     }
@@ -578,8 +575,7 @@ get_token_objects_for_cache(
     }
     if (status == PR_SUCCESS) {
         nss_ZFreeIf(objects);
-    }
-    else {
+    } else {
         PRUint32 j;
         for (j = 0; j < i; j++) {
             /* sigh */
@@ -824,8 +820,7 @@ nssTokenObjectCache_GetObjectAttributes(
                         atemplate[i].ulValueLen < attr->ulValueLen) {
                         goto loser;
                     }
-                }
-                else {
+                } else {
                     atemplate[i].pValue = nss_ZAlloc(arena, attr->ulValueLen);
                     if (!atemplate[i].pValue) {
                         goto loser;
@@ -906,15 +901,13 @@ nssTokenObjectCache_ImportObject(
         (*oa)->object->token = NULL;
         nssCryptokiObject_Destroy((*oa)->object);
         nssArena_Destroy((*oa)->arena);
-    }
-    else {
+    } else {
         /* Create space for a new entry */
         if (count > 0) {
             *otype = nss_ZREALLOCARRAY(*otype,
                                        nssCryptokiObjectAndAttributes *,
                                        count + 2);
-        }
-        else {
+        } else {
             *otype = nss_ZNEWARRAY(NULL, nssCryptokiObjectAndAttributes *, 2);
         }
     }
@@ -922,8 +915,7 @@ nssTokenObjectCache_ImportObject(
         nssCryptokiObject *copyObject = nssCryptokiObject_Clone(object);
         (*otype)[count] = create_object_of_type(copyObject, objectType,
                                                 &status);
-    }
-    else {
+    } else {
         status = PR_FAILURE;
     }
     PZ_Unlock(cache->lock);