aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLev Walkin <vlm@lionet.info>2017-09-26 23:04:57 -0700
committerLev Walkin <vlm@lionet.info>2017-09-26 23:05:14 -0700
commit15b26e6d50751a26b2283fe47ed7a00b278ebf1a (patch)
treed49140d55aaeebd5a83022ae5bc924b4cab2e2fa
parentad775916a7a7d946193103cc32f90284c240575d (diff)
converter-sample renamed into converter-example
-rw-r--r--ChangeLog1
-rw-r--r--doc/asn1c-usage.pdfbin204663 -> 205031 bytes
-rw-r--r--doc/docsrc/asn1c-usage.tex13
-rwxr-xr-xtests/tests-c-compiler/check-assembly.sh2
4 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a4d4b26..1bbf881d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
* Added LTE RRC example (Bi-Ruei, Chiu).
* Added IEEE 1609.2 example.
* Added SAE J2735 example.
+ * converter-sample.c renamed into converter-example.c
* CVE-2017-12966 verified not present.
* Fix incomplete (failed) CHOICE XER decoding memory leak.
(Severity: medium; Security impact: medium)
diff --git a/doc/asn1c-usage.pdf b/doc/asn1c-usage.pdf
index bbfe7bbe..a4d82510 100644
--- a/doc/asn1c-usage.pdf
+++ b/doc/asn1c-usage.pdf
Binary files differ
diff --git a/doc/docsrc/asn1c-usage.tex b/doc/docsrc/asn1c-usage.tex
index dda59ca9..c1d5b732 100644
--- a/doc/docsrc/asn1c-usage.tex
+++ b/doc/docsrc/asn1c-usage.tex
@@ -203,15 +203,16 @@ RectangleTest ASN.1 module defined in the beginning of this document).
decoders and other useful routines. There will be quite a few of them, some
of them are not even always necessary, but the overall amount of code
after compilation will be rather small anyway.
-\item A \emph{converter-sample.c} file containing the \emph{int main()} function with a fully functioning decoder. It can convert a given PDU between BER, XER and possibly OER and PER (if -gen-OER or -gen-PER options to asn1c were in effect). At some point you will want to replace this file with your own file containing the \emph{int main()} function.
-\item A \emph{Makefile.am.sample} file mentioning all the files created
-at the earlier steps. This file is suitable for either automake suite
-or the plain `make` utility. Just rename it into \emph{Makefile}.
+\item A \emph{converter-example.c} file containing the \emph{int main()} function with a fully functioning decoder. It can convert a given PDU between BER, XER and possibly OER and PER (if -gen-OER or -gen-PER options to asn1c were in effect). At some point you will want to replace this file with your own file containing the \emph{int main()} function.
+\item A \emph{Makefile.am.libasncodecs} file mentioning all the files created
+at the earlier steps. The accompanying \emph{Makefile.am.example} file is
+suitable for either automake suite or the plain `make` utility.
+Just rename it into \emph{Makefile}.
\end{itemize}
It is possible to compile everything with just a couple of instructions:
\begin{bash}
asn1c -pdu=%\emph{Rectangle}% *.asn1
-make -f Makefile.am.sample # If you use `make`
+make -f Makefile.am.example # If you use `make`
\end{bash}
or
\begin{bash}
@@ -220,7 +221,7 @@ cc -I. -DPDU=%\emph{Rectangle}% -o rectangle.exe *.c # ... or like this
\end{bash}
Refer to the Chapter \ref{cha:Step-by-step-examples} for a sample
\emph{int main()} function if you want some custom logic and not satisfied
-with the supplied \emph{converter-sample.c}.
+with the supplied \emph{converter-example.c}.
\clearpage{}
\section{\label{sec:Command-line-options}Command line options}
diff --git a/tests/tests-c-compiler/check-assembly.sh b/tests/tests-c-compiler/check-assembly.sh
index fa31df0b..de90b267 100755
--- a/tests/tests-c-compiler/check-assembly.sh
+++ b/tests/tests-c-compiler/check-assembly.sh
@@ -110,7 +110,7 @@ compiled-module: ${asn_module} ${abs_top_builddir}/asn1c/asn1c
-S ${abs_top_srcdir}/skeletons \\
-Wdebug-compiler \\
${AFLAGS} ${asn_module}
- rm -f converter-sample.c
+ rm -f converter-example.c
@touch compiled-module
TARGETS