github.com/mikpe.pdp10-tools
1
0
Fork 0
mirror of https://github.com/mikpe/pdp10-tools.git synced 2026-01-23 19:08:00 +00:00
Code Issues Projects Releases Wiki Activity

od: use error:format/1, remove pointless check of skip_bytes/4 return value

Browse Source
This commit is contained in:
Mikael Pettersson 2019-08-16 17:57:25 +02:00
parent f2efa4979f
commit 5e34a16dec
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
erlang/apps/od/src/od.erl
View File

@ -52,8 +52,8 @@ main_(Argv) ->
]) of
{ok, {Options, Files}} ->
od(scan_options(Options), Files);
{error, ErrMsg} ->
escript_runtime:errmsg("~s\n", [ErrMsg]),
{error, Reason} ->
escript_runtime:errmsg("~s\n", [error:format(Reason)]),
usage()
end.
@ -141,8 +141,9 @@ parse_bytes(String) ->
case strtol:parse(String, 0) of
{ok, {Value, Rest}} ->
Value * parse_multiplier(Rest);
{error, _Reason} ->
escript_runtime:fatal("invalid number '~s'\n", [String])
{error, Reason} ->
escript_runtime:fatal("invalid number '~s': ~s\n",
[String, error:format(Reason)])
end.
parse_multiplier(String) ->
@ -230,12 +231,8 @@ compile_numfmt(Base, Pad, Opts) ->
od(Opts, Files) ->
#options{read_bytes = ReadBytes, skip_bytes = SkipBytes} = Opts,
Status =
case skip_bytes(SkipBytes, Opts, input_init(Files, ReadBytes), 0) of
ok -> 0;
{error, _Reason} -> 1
end,
halt(Status).
skip_bytes(SkipBytes, Opts, input_init(Files, ReadBytes), 0),
halt(0).
skip_bytes(0, Opts, Input, Offset) -> output_lines(Opts, Input, Offset);
skip_bytes(SkipBytes, Opts, Input, Offset) when SkipBytes > 0 ->
@ -420,7 +417,8 @@ input_fgetc_raw(Input) ->
, files = Files
});
{error, Reason} ->
escript_runtime:fatal("failed to open ~s: ~p\n", [File, Reason])
escript_runtime:fatal("failed to open ~s: ~s\n",
[File, error:format(Reason)])
end
end;
FP ->
@ -432,7 +430,8 @@ input_fgetc_raw(Input) ->
input_fgetc_raw(Input#input{pdp10fp = []});
{error, Reason} ->
File = Input#input.file,
escript_runtime:fatal("error reading ~s: ~p\n", [File, Reason])
escript_runtime:fatal("error reading ~s: ~s\n",
[File, error:format(Reason)])
end
end.