diff options
| author | Björn Gustavsson <[email protected]> | 2012-09-19 15:55:53 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-09-20 11:09:40 +0200 |
| commit | a0c65862e8beaca2d2c0b9d6d13eca862641994c (patch) | |
| tree | 18097ae906fc648bf05298ea35da57d8c2054dd9 | |
| parent | c24f87e19cc01437c3c7b84e9c3fbeceb8c3b736 (diff) | |
| download | otp-a0c65862e8beaca2d2c0b9d6d13eca862641994c.tar.gz otp-a0c65862e8beaca2d2c0b9d6d13eca862641994c.tar.bz2 otp-a0c65862e8beaca2d2c0b9d6d13eca862641994c.zip | |
common_test: Don't use undocumented features of io:format()
The Format string argument for io:format() is not documented
to accept an iolist, so we should not depend on it.
Also, it is bad practice to use an arbitrary string as a format
string for io:format(), since it could contain a '~' character
which could trigger a badarg exception.
Fix both problems at the same time by using io:put_chars() to
display the iolist.
| -rw-r--r-- | lib/common_test/src/ct_master.erl | 5 | ||||
| -rw-r--r-- | lib/common_test/src/ct_master_logs.erl | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl index 042c5ba267..99bec3ea09 100644 --- a/lib/common_test/src/ct_master.erl +++ b/lib/common_test/src/ct_master.erl @@ -696,8 +696,9 @@ status(MasterPid,Event) -> log(To,Heading,Str,Args) -> if To == all ; To == tty -> - Str1 = ["=== ",Heading," ===\n",io_lib:format(Str,Args),"\n"], - io:format(Str1,[]); + Chars = ["=== ",Heading," ===\n", + io_lib:format(Str,Args),"\n"], + io:put_chars(Chars); true -> ok end, diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl index 9e61d5b16f..1e65337241 100644 --- a/lib/common_test/src/ct_master_logs.erl +++ b/lib/common_test/src/ct_master_logs.erl @@ -204,7 +204,7 @@ open_ct_master_log(Dir) -> {ok,Fd} = file:open(FullName,[write]), io:format(Fd,header("Common Test Master Log", {[],[1,2],[]}),[]), %% maybe add config info here later - io:format(Fd, config_table([]), []), + io:put_chars(config_table([])), io:format(Fd, "<style>\n" "div.ct_internal { background:lightgrey; color:black }\n" @@ -253,11 +253,11 @@ open_nodedir_index(Dir,StartTime) -> print_nodedir(Node,RunDir,Fd) -> Index = filename:join(RunDir,"index.html"), - io:format(Fd, - ["<tr>\n" - "<td align=center>",atom_to_list(Node),"</td>\n", - "<td align=left><a href=\"",Index,"\">",Index,"</a></td>\n", - "</tr>\n"],[]), + io:put_chars(Fd, + ["<tr>\n" + "<td align=center>",atom_to_list(Node),"</td>\n", + "<td align=left><a href=\"",Index,"\">",Index,"</a></td>\n", + "</tr>\n"]), ok. close_nodedir_index(Fd) -> |