Reorder functions to avoid forward declaration of DecodePointer

1 files changed, 19 insertions, 23 deletions

diff --git a/security/nss/lib/util/quickder.c b/security/nss/lib/util/quickder.c
index 38c42f5e9..8e4eb1ac4 100644
--- a/security/nss/lib/util/quickder.c
+++ b/security/nss/lib/util/quickder.c
@@ -447,10 +447,6 @@ static SECStatus DecodeItem(void* dest,
                      const SEC_ASN1Template* templateEntry,
                      SECItem* src, QuickAlloc* pool, PRBool checkTag);
 
-static SECStatus DecodePointer(void* dest,
-                     const SEC_ASN1Template* templateEntry,
-                     SECItem* src, QuickAlloc* pool, PRBool checkTag);
-
 static SECStatus DecodeSequence(void* dest,
                      const SEC_ASN1Template* templateEntry,
                      SECItem* src, QuickAlloc* pool)
@@ -511,25 +507,6 @@ static SECStatus DecodeInline(void* dest,
                             inlineTemplate, src, pool, PR_TRUE);
 }
 
-static SECStatus DecodeImplicit(void* dest,
-                     const SEC_ASN1Template* templateEntry,
-                     SECItem* src, QuickAlloc* pool)
-{
-    if (templateEntry->kind & SEC_ASN1_POINTER)
-    {
-        return DecodePointer((void*)((char*)dest ),
-                             templateEntry, src, pool, PR_FALSE);
-    }
-    else
-    {
-        const SEC_ASN1Template* implicitTemplate =
-            SEC_ASN1GetSubtemplate (templateEntry, dest, PR_FALSE);
-
-        return DecodeItem((void*)((char*)dest + templateEntry->offset),
-                          implicitTemplate, src, pool, PR_FALSE);
-    }
-}
-
 static SECStatus DecodePointer(void* dest,
                      const SEC_ASN1Template* templateEntry,
                      SECItem* src, QuickAlloc* pool, PRBool checkTag)
@@ -549,6 +526,25 @@ static SECStatus DecodePointer(void* dest,
     }
 }
 
+static SECStatus DecodeImplicit(void* dest,
+                     const SEC_ASN1Template* templateEntry,
+                     SECItem* src, QuickAlloc* pool)
+{
+    if (templateEntry->kind & SEC_ASN1_POINTER)
+    {
+        return DecodePointer((void*)((char*)dest ),
+                             templateEntry, src, pool, PR_FALSE);
+    }
+    else
+    {
+        const SEC_ASN1Template* implicitTemplate =
+            SEC_ASN1GetSubtemplate (templateEntry, dest, PR_FALSE);
+
+        return DecodeItem((void*)((char*)dest + templateEntry->offset),
+                          implicitTemplate, src, pool, PR_FALSE);
+    }
+}
+
 static SECStatus DecodeChoice(void* dest,
                      const SEC_ASN1Template* templateEntry,
                      SECItem* src, QuickAlloc* pool)