← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/inviso/src/inviso_lfm.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/inviso/src/inviso_lfm.erl
87
87
%%   close the outfile.
88
88
%%
89
89
%% Using merge/2 assumes you want to use default handlers writing to a file.
90
 
merge(Files,OutputFile) when list(OutputFile) ->
 
90
merge(Files,OutputFile) when is_list(OutputFile) ->
91
91
    merge(Files,fun outfile_opener/1,fun outfile_writer/4,fun outfile_closer/1,OutputFile,off).
92
 
merge(Files,WorkHandlerFun,HandlerData) when function(WorkHandlerFun) ->
 
92
merge(Files,WorkHandlerFun,HandlerData) when is_function(WorkHandlerFun) ->
93
93
    merge(Files,void,WorkHandlerFun,void,HandlerData,off);
94
 
merge(Files,OutputFile,Dbg) when list(OutputFile) ->
 
94
merge(Files,OutputFile,Dbg) when is_list(OutputFile) ->
95
95
    merge(Files,fun outfile_opener/1,fun outfile_writer/4,fun outfile_closer/1,OutputFile,Dbg).
96
 
merge(Files,WorkHandlerFun,HandlerData,Dbg) when function(WorkHandlerFun) ->
 
96
merge(Files,WorkHandlerFun,HandlerData,Dbg) when is_function(WorkHandlerFun) ->
97
97
    merge(Files,void,WorkHandlerFun,void,HandlerData,Dbg).
98
98
merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData) ->
99
99
    merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData,off).
123
123
        {ok,Readers} ->
124
124
            process_flag(trap_exit,true),
125
125
            if
126
 
                function(BeginHandlerFun) ->
 
126
                is_function(BeginHandlerFun) ->
127
127
                    case catch BeginHandlerFun(HandlerData) of
128
128
                        {ok,NewHandlerData} ->
129
129
                            init_receiver_2(From,WorkHandlerFun,EndHandlerFun,
145
145
    {Reply,NewHandlerData}=
146
146
        loop(From,WorkHandlerFun,HandlerData,NewReaders,EntryStruct,Dbg,0),
147
147
    if
148
 
        function(EndHandlerFun) ->
 
148
        is_function(EndHandlerFun) ->
149
149
            case EndHandlerFun(NewHandlerData) of
150
150
                ok ->
151
151
                    From ! {reply,self(),Reply};
207
207
    case list_all_entries(EntryStruct) of
208
208
        [] ->                               % The we are done!
209
209
            done;
210
 
        EntryList when list(EntryList) ->   % Find smallest timestamp in here then.
 
210
        EntryList when is_list(EntryList) ->   % Find smallest timestamp in here then.
211
211
            {Pid,Node,PidMappings,_TS,Term}=
212
212
                lists:foldl(fun({P,N,PMap,TS1,T},{_P,_N,_PMap,TS0,_T}) when TS1<TS0 ->
213
213
                                    {P,N,PMap,TS1,T};