Skip to content

A
asn1c
Commit 59337e46 authored by Mouse's avatar Mouse
Browse files
Options

Merge remote-tracking branch 'upstream/master' into vlm_master

parents d8bd2077 0d536ce2
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
AUTHORS
View file @ 59337e46
...@@ -12,12 +12,14 @@ Erika Thorsen (akire @ github) ...@@ -12,12 +12,14 @@ Erika Thorsen (akire @ github)
gareins @ github gareins @ github
johvik @ github johvik @ github
Jon Ringle (ringlej @ github) Jon Ringle (ringlej @ github)
kuepe-sl @ github
Lev Walkin <vlm@lionet.info> Lev Walkin <vlm@lionet.info>
Max Khon (mkhon @ github) Max Khon (mkhon @ github)
Maxim Kuzmin (AuthenticEshkinKot @ github) Maxim Kuzmin (AuthenticEshkinKot @ github)
mouse07410 @ github mouse07410 @ github
Oskar Holmlund (ikarso @ github) Oskar Holmlund (ikarso @ github)
Ray Zhang (zhanglei002 @ github) Ray Zhang (zhanglei002 @ github)
Russ Kubik <russkubik@gmail.com>
Simo Sorce <simo@redhat.com> Simo Sorce <simo@redhat.com>
theirix @ github theirix @ github
Uri Blumenthal Uri Blumenthal
......
asn1-tools/unber/libasn1_unber_tool.c
View file @ 59337e46
...@@ -171,8 +171,8 @@ process_deeper(const char *fname, input_stream_t *ibs, output_stream_t *os, ...@@ -171,8 +171,8 @@ process_deeper(const char *fname, input_stream_t *ibs, output_stream_t *os,
if(limit > 0 || expect_eoc) { if(limit > 0 || expect_eoc) {
osprintfError(os, osprintfError(os,
"%s: Unexpected end of file (TL)" "%s: Unexpected end of file (TL)"
" at %zu\n", " at %lld\n",
fname, (size_t)ibs->bytesRead(ibs)); fname, (long long)ibs->bytesRead(ibs));
return PD_FAILED; return PD_FAILED;
} else { } else {
return PD_EOF; return PD_EOF;
...@@ -189,8 +189,8 @@ process_deeper(const char *fname, input_stream_t *ibs, output_stream_t *os, ...@@ -189,8 +189,8 @@ process_deeper(const char *fname, input_stream_t *ibs, output_stream_t *os,
case -1: case -1:
osprintfError(os, osprintfError(os,
"%s: Fatal error decoding tag" "%s: Fatal error decoding tag"
" at %zu\n", " at %lld\n",
fname, (size_t)ibs->bytesRead(ibs)); fname, (long long)ibs->bytesRead(ibs));
return PD_FAILED; return PD_FAILED;
case 0: case 0:
/* More data expected */ /* More data expected */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment