aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2014-03-25 18:34:52 +0100
committerAnders Svensson <[email protected]>2014-03-29 19:20:44 +0100
commit2411e900e70c2d66433227e0ee7605e71fbf8d75 (patch)
treeba678c5f2ddff0c917879b328660c1aa9c70b7fa
parent174fb0a3ed8bee95ac3293866905dc28bed54f96 (diff)
downloadotp-2411e900e70c2d66433227e0ee7605e71fbf8d75.tar.gz
otp-2411e900e70c2d66433227e0ee7605e71fbf8d75.tar.bz2
otp-2411e900e70c2d66433227e0ee7605e71fbf8d75.zip
Remove case expecting a pre-R16B return value from os:type/1
The documented return value changed in commit c37a9761.
-rw-r--r--lib/diameter/src/base/diameter_dbg.erl4
-rw-r--r--lib/diameter/src/base/diameter_info.erl14
2 files changed, 11 insertions, 7 deletions
diff --git a/lib/diameter/src/base/diameter_dbg.erl b/lib/diameter/src/base/diameter_dbg.erl
index 5b0ac3a3b6..6b92234b0b 100644
--- a/lib/diameter/src/base/diameter_dbg.erl
+++ b/lib/diameter/src/base/diameter_dbg.erl
@@ -17,6 +17,10 @@
%% %CopyrightEnd%
%%
+%%
+%% Information and debug functions.
+%%
+
-module(diameter_dbg).
-export([table/1,
diff --git a/lib/diameter/src/base/diameter_info.erl b/lib/diameter/src/base/diameter_info.erl
index 39d32d07cd..10972f3231 100644
--- a/lib/diameter/src/base/diameter_info.erl
+++ b/lib/diameter/src/base/diameter_info.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -17,6 +17,11 @@
%% %CopyrightEnd%
%%
+%%
+%% Generic functions for formatting table listings and more. Used by
+%% diameter_dbg.
+%%
+
-module(diameter_info).
-export([usage/1,
@@ -573,12 +578,7 @@ sys_info() ->
{A,V}.
os_info() ->
- {os:version(), case os:type() of
- {_Fam, _Name} = T ->
- T;
- Fam ->
- {Fam, ""}
- end}.
+ {os:version(), os:type()}.
chomp(S) ->
string:strip(S, right, $\n).