From 5b7eeaffb224e4e5734c550add6084475697e3d3 Mon Sep 17 00:00:00 2001 From: Lev Walkin <vlm@lionet.info> Date: Mon, 28 Mar 2005 17:52:43 +0000 Subject: [PATCH] better wrapping --- libasn1print/asn1print.c | 4 ++-- tests/07-int-OK.asn1.-EF | 4 ++-- tests/14-resolver-OK.asn1.-EF | 4 ++-- tests/32-sequence-of-OK.asn1.-EF | 4 ++-- tests/55-components-of-OK.asn1.-EF | 4 ++-- tests/60-any-OK.asn1.-EF | 4 ++-- tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints | 3 ++- tests/79-constrained-by-OK.asn1.-EF | 4 ++-- tests/82-with-comps-OK.asn1.-EF | 4 ++-- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/libasn1print/asn1print.c b/libasn1print/asn1print.c index fc0e7b35..082b3a3a 100644 --- a/libasn1print/asn1print.c +++ b/libasn1print/asn1print.c @@ -126,9 +126,9 @@ asn1print_oid(int prior_len, asn1p_oid_t *oid, enum asn1print_flags flags) { for(ac = 0; ac < oid->arcs_count; ac++) { const char *arcname = oid->arcs[ac].name; - if(accum + strlen(arcname ? arcname : "") > 75) { + if(accum + strlen(arcname ? arcname : "") > 72) { printf("\n\t"); - accum = 0; + accum = 8; } else { accum += printf(" "); } diff --git a/tests/07-int-OK.asn1.-EF b/tests/07-int-OK.asn1.-EF index 86ee7f84..2ec50fcd 100644 --- a/tests/07-int-OK.asn1.-EF +++ b/tests/07-int-OK.asn1.-EF @@ -1,5 +1,5 @@ -ModuleTestInt1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) 7 } +ModuleTestInt1 { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 7 } DEFINITIONS ::= BEGIN diff --git a/tests/14-resolver-OK.asn1.-EF b/tests/14-resolver-OK.asn1.-EF index 2ab60ee2..8c3eb0fa 100644 --- a/tests/14-resolver-OK.asn1.-EF +++ b/tests/14-resolver-OK.asn1.-EF @@ -32,8 +32,8 @@ Enumeration ::= ENUMERATED { END -HiddenModule { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) 14 3 } +HiddenModule { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 14 3 } DEFINITIONS ::= BEGIN diff --git a/tests/32-sequence-of-OK.asn1.-EF b/tests/32-sequence-of-OK.asn1.-EF index 9809141b..1fa4e101 100644 --- a/tests/32-sequence-of-OK.asn1.-EF +++ b/tests/32-sequence-of-OK.asn1.-EF @@ -1,5 +1,5 @@ -ModuleTestSequenceSimple { iso org(3) dod(6) internet(1) private(4) enterprise(1) - spelio(9363) software(1) asn1c(5) test(1) 32 } +ModuleTestSequenceSimple { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 32 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/55-components-of-OK.asn1.-EF b/tests/55-components-of-OK.asn1.-EF index 3251d432..b7b227fe 100644 --- a/tests/55-components-of-OK.asn1.-EF +++ b/tests/55-components-of-OK.asn1.-EF @@ -1,5 +1,5 @@ -ModuleTestComponentsOf { iso org(3) dod(6) internet(1) private(4) enterprise(1) - spelio(9363) software(1) asn1c(5) test(1) 55 } +ModuleTestComponentsOf { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 55 } DEFINITIONS AUTOMATIC TAGS ::= BEGIN diff --git a/tests/60-any-OK.asn1.-EF b/tests/60-any-OK.asn1.-EF index 520c6c9f..73c658fd 100644 --- a/tests/60-any-OK.asn1.-EF +++ b/tests/60-any-OK.asn1.-EF @@ -1,5 +1,5 @@ -ModuleTestANY { iso org(3) dod(6) internet(1) private(4) enterprise(1) spelio(9363) - software(1) asn1c(5) test(1) 60 } +ModuleTestANY { iso org(3) dod(6) internet(1) private(4) enterprise(1) + spelio(9363) software(1) asn1c(5) test(1) 60 } DEFINITIONS IMPLICIT TAGS ::= BEGIN diff --git a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints index 45cb5156..8f9cc6ba 100644 --- a/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints +++ b/tests/74-int-enum-constraints-OK.asn1.-EFprint-constraints @@ -1,5 +1,6 @@ ModuleTestIntegerAndEnumeratedConstraints { iso org(3) dod(6) internet(1) - private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 74 } + private(4) enterprise(1) spelio(9363) software(1) asn1c(5) test(1) + 74 } DEFINITIONS ::= BEGIN diff --git a/tests/79-constrained-by-OK.asn1.-EF b/tests/79-constrained-by-OK.asn1.-EF index 0a91f340..f462be00 100644 --- a/tests/79-constrained-by-OK.asn1.-EF +++ b/tests/79-constrained-by-OK.asn1.-EF @@ -1,5 +1,5 @@ -ModuleTestConstrainedBy { iso org(3) dod(6) internet(1) private(4) enterprise(1) - spelio(9363) software(1) asn1c(5) test(1) 79 } +ModuleTestConstrainedBy { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 79 } DEFINITIONS ::= BEGIN diff --git a/tests/82-with-comps-OK.asn1.-EF b/tests/82-with-comps-OK.asn1.-EF index 34ea419c..f4fe9aaa 100644 --- a/tests/82-with-comps-OK.asn1.-EF +++ b/tests/82-with-comps-OK.asn1.-EF @@ -1,5 +1,5 @@ -ModuleTestWithComponents { iso org(3) dod(6) internet(1) private(4) enterprise(1) - spelio(9363) software(1) asn1c(5) test(1) 82 } +ModuleTestWithComponents { iso org(3) dod(6) internet(1) private(4) + enterprise(1) spelio(9363) software(1) asn1c(5) test(1) 82 } DEFINITIONS ::= BEGIN -- GitLab