diff --git a/libasn1print/asn1print.c b/libasn1print/asn1print.c index 886c949213d949a47cf9c8fd0aa3900fe6307c4c..4132204f081172dd8a23b25781f5a5d818f443b2 100644 --- a/libasn1print/asn1print.c +++ b/libasn1print/asn1print.c @@ -31,6 +31,7 @@ static int asn1print_expr(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *tc, e int asn1print(asn1p_t *asn, enum asn1print_flags flags) { asn1p_module_t *mod; + int modno = 0; if(asn == NULL) { errno = EINVAL; @@ -38,6 +39,7 @@ asn1print(asn1p_t *asn, enum asn1print_flags flags) { } TQ_FOR(mod, &(asn->modules), mod_next) { + if(modno++) printf("\n"); asn1print_module(asn, mod, flags); } @@ -48,7 +50,7 @@ static int asn1print_module(asn1p_t *asn, asn1p_module_t *mod, enum asn1print_flags flags) { asn1p_expr_t *tc; - printf("\n%s ", mod->Identifier); + printf("%s ", mod->Identifier); if(mod->module_oid) { asn1print_oid(mod->module_oid, flags); printf("\n"); diff --git a/tests/04-enum-SE.asn1.-E b/tests/04-enum-SE.asn1.-E index c908ea5f3f9fce86d4a3f3a80d5c9769b6c96c41..19b431cc5e4e8d1ea44f60c24e1d304fc73e5c13 100644 --- a/tests/04-enum-SE.asn1.-E +++ b/tests/04-enum-SE.asn1.-E @@ -1,4 +1,3 @@ - ModuleTestEnum2 {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 4 } diff --git a/tests/07-int-OK.asn1.-EF b/tests/07-int-OK.asn1.-EF index 54faa1089a0d69207823ebfcb27dc928503f45be..3b93cd37e86b877a3d9687aa127c9585f770cfa5 100644 --- a/tests/07-int-OK.asn1.-EF +++ b/tests/07-int-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestInt1 {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 7 } diff --git a/tests/14-resolver-OK.asn1.-EF b/tests/14-resolver-OK.asn1.-EF index 7070bc8e4c237447586da02ba7892c200e50e05f..31793f225ebb0e6d14304ee2504e62ed5b510a70 100644 --- a/tests/14-resolver-OK.asn1.-EF +++ b/tests/14-resolver-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestResolver2 {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 14 1 } diff --git a/tests/16-constraint-OK.asn1.-EF b/tests/16-constraint-OK.asn1.-EF index 237fb5741c4162355656edcc1e79d49aaf826161..61d81227b70868d30d31f0a43110bb7a008465b1 100644 --- a/tests/16-constraint-OK.asn1.-EF +++ b/tests/16-constraint-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestConstraint {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 16 } diff --git a/tests/19-param-OK.asn1.-EF b/tests/19-param-OK.asn1.-EF index 624041433c86d13523ea4395d7774ffede776e54..f2daaf39b946f63bae972096d222aae280a767ef 100644 --- a/tests/19-param-OK.asn1.-EF +++ b/tests/19-param-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestParam {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 19 } diff --git a/tests/20-constr-OK.asn1.-EF b/tests/20-constr-OK.asn1.-EF index dbbdacaefa84d27b18c8aec7b7d40a631a35e1a6..fe61cfecdce12c9a80a6c48772bbff3157c84ab7 100644 --- a/tests/20-constr-OK.asn1.-EF +++ b/tests/20-constr-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestConstr {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 20 } diff --git a/tests/21-tags-OK.asn1.-EF b/tests/21-tags-OK.asn1.-EF index a8fd93c7070beb6b2536c395f01abd5955b2e755..857c581f3ba8987b78f10f9873b7ee047271b2ad 100644 --- a/tests/21-tags-OK.asn1.-EF +++ b/tests/21-tags-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestTags1 {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 21 1 } diff --git a/tests/22-tags-OK.asn1.-EF b/tests/22-tags-OK.asn1.-EF index c6c97c99b86593c2821ae2aa164b1b856a89cff6..50fce1e8d8547b4fde630d70387620ab54f887fe 100644 --- a/tests/22-tags-OK.asn1.-EF +++ b/tests/22-tags-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestTags3 {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 22 } diff --git a/tests/23-bits-OK.asn1.-EF b/tests/23-bits-OK.asn1.-EF index f65f3b369a49c3dda5b3cfb34c0ae56f401d73c0..45ff4da7a3543ae721f0d7ea1c117a6469a30d6b 100644 --- a/tests/23-bits-OK.asn1.-EF +++ b/tests/23-bits-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestBitString {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 23 } diff --git a/tests/24-sequence-OK.asn1.-EF b/tests/24-sequence-OK.asn1.-EF index 87740d67d072e7ef133ac0ce44ae79030d895b40..e45e04aee852cd1c272f86b44f27cc4ff38e404f 100644 --- a/tests/24-sequence-OK.asn1.-EF +++ b/tests/24-sequence-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestSequence {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 24 } diff --git a/tests/31-set-of-OK.asn1.-EF b/tests/31-set-of-OK.asn1.-EF index 46a7dfbf081d1b509bc0a72d469202031236082a..692450b1ac9a641c5e948d8a6adac1f733322bf8 100644 --- a/tests/31-set-of-OK.asn1.-EF +++ b/tests/31-set-of-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestSetOfSimple {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 31 } diff --git a/tests/32-sequence-of-OK.asn1.-EF b/tests/32-sequence-of-OK.asn1.-EF index 543c2ab9160dd86c603eb77a4c51071886ae55c2..3697ef1212fa6928888c23ce3246f6476af0d499 100644 --- a/tests/32-sequence-of-OK.asn1.-EF +++ b/tests/32-sequence-of-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestSequenceSimple {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 32 } diff --git a/tests/34-class-OK.asn1.-EF b/tests/34-class-OK.asn1.-EF index 7a181c3bf5b6ee921f593e33fcf8a8480c6db04a..52ba8670415cab80c551c41abdd1c44293aec230 100644 --- a/tests/34-class-OK.asn1.-EF +++ b/tests/34-class-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestClassSimple {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 34 } diff --git a/tests/37-indirect-choice-OK.asn1.-EF b/tests/37-indirect-choice-OK.asn1.-EF index 88f7b03b182d183653fd9bed08918726244eb4e9..4f8c80b7ca487e013edbf46f7791bd7295bc6957 100644 --- a/tests/37-indirect-choice-OK.asn1.-EF +++ b/tests/37-indirect-choice-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestIndirectChoiceFine {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 37 } diff --git a/tests/42-real-life-OK.asn1.-EF b/tests/42-real-life-OK.asn1.-EF index c07dccf412ba2be3eeed325280632b16357fd6bf..6b5249d86b7f3ba5c7c4b3455e12e270562ccd84 100644 --- a/tests/42-real-life-OK.asn1.-EF +++ b/tests/42-real-life-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleLAPStorage {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 42 } diff --git a/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt b/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt index 62dc0e37342e86469220ca3c54885b5ae6b2aacc..99dcd60f5f67cdec6bd4eb04865ce07de832bdb2 100644 --- a/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt +++ b/tests/45-undefined-type-SE.asn1.-EFfknown-extern-type=KnownExt @@ -1,4 +1,3 @@ - ModuleKnownExternType {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 45 } diff --git a/tests/49-real-life-OK.asn1.-E b/tests/49-real-life-OK.asn1.-E index 7439005c74d0cdb84df713e7ed08ab469fca0fcb..e3d9d351ccb3962ca5625463098683e9e27ca15e 100644 --- a/tests/49-real-life-OK.asn1.-E +++ b/tests/49-real-life-OK.asn1.-E @@ -1,4 +1,3 @@ - ModuleSetChoiceExtensibility {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 49 } diff --git a/tests/50-constraint-OK.asn1.-EFprint-constraints b/tests/50-constraint-OK.asn1.-EFprint-constraints index 8fb42287a37bce51bb499db79915d675f2f72716..393826debc19315dfa975409058e6052c311a890 100644 Binary files a/tests/50-constraint-OK.asn1.-EFprint-constraints and b/tests/50-constraint-OK.asn1.-EFprint-constraints differ diff --git a/tests/55-components-of-OK.asn1.-EF b/tests/55-components-of-OK.asn1.-EF index e6655db832fb5b648014a33059c26354d304ff09..1ace859371b35482b5336c577c5c9f86b81a9f35 100644 --- a/tests/55-components-of-OK.asn1.-EF +++ b/tests/55-components-of-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestComponentsOf {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 55 } diff --git a/tests/58-param-OK.asn1.-EF b/tests/58-param-OK.asn1.-EF index 3f950bfb4684b5fccec6c14812e81b11eed3f5ce..168b0577d22797787ee3e1bf282371edc3df1f59 100644 --- a/tests/58-param-OK.asn1.-EF +++ b/tests/58-param-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestParam {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 58 } diff --git a/tests/60-any-OK.asn1.-EF b/tests/60-any-OK.asn1.-EF index e2c89e686abfa2b68412b2284b3d1f2a84e762cf..064a0b9f4956601ff8012f77e3daf37c1e6a0b9d 100644 --- a/tests/60-any-OK.asn1.-EF +++ b/tests/60-any-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestANY {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 60 } diff --git a/tests/62-any-OK.asn1.-EF b/tests/62-any-OK.asn1.-EF index bc08f0389eee69713fb655b15f5cb2c68d04ca2c..76549a6999952372411c06b255eed3679fda1aa1 100644 --- a/tests/62-any-OK.asn1.-EF +++ b/tests/62-any-OK.asn1.-EF @@ -1,4 +1,3 @@ - ModuleTestANYSyntax {iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 62 }