~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/stdlib/src/gen.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%%
4
 
%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
 
4
%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
5
5
%%
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
29
29
 
30
30
-export([init_it/6, init_it/7]).
31
31
 
 
32
-export([format_status_header/2]).
 
33
 
32
34
-define(default_timeout, 5000).
33
35
 
34
36
%%-----------------------------------------------------------------
271
273
%%%-----------------------------------------------------------------
272
274
%%%  Misc. functions.
273
275
%%%-----------------------------------------------------------------
274
 
where({global, Name}) -> global:safe_whereis_name(Name);
 
276
where({global, Name}) -> global:whereis_name(Name);
275
277
where({local, Name})  -> whereis(Name).
276
278
 
277
279
name_register({local, Name} = LN) ->
315
317
        {ok, Options} -> sys:debug_options(Options);
316
318
        _ -> []
317
319
    end.
 
320
 
 
321
format_status_header(TagLine, Pid) when is_pid(Pid) ->
 
322
    lists:concat([TagLine, " ", pid_to_list(Pid)]);
 
323
format_status_header(TagLine, RegName) when is_atom(RegName) ->
 
324
    lists:concat([TagLine, " ", RegName]);
 
325
format_status_header(TagLine, Name) ->
 
326
    {TagLine, Name}.