← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/snmp/src/compile/snmpc_tok.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/snmp/src/compile/snmpc_tok.erl
1
1
%% 
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 1996-2010. 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
37
37
-export([null_get_line/0, format_error/1, terminate/2, handle_call/3, init/1,
38
38
         test/0]).
39
39
 
 
40
-include("snmpc_lib.hrl").
 
41
 
40
42
 
41
43
%%----------------------------------------------------------------------
42
44
%% Reserved_words: list of KeyWords. Example: ['IF', 'BEGIN', ..., 'GOTO']
130
132
                'current','deprecated','not-accessible','obsolete', 
131
133
                'read-create','read-only','read-write', 'IMPORTS', 'FROM',
132
134
                'MODULE-COMPLIANCE',
 
135
                'AGENT-CAPABILITIES',
 
136
                'PRODUCT-RELEASE',
 
137
                'SUPPORTS',
 
138
                'INCLUDES',
133
139
                'DisplayString', 
134
140
                'PhysAddress', 
135
141
                'MacAddress', 
225
231
    case catch tokenise(Str) of
226
232
        {error, ErrorInfo} -> {error, ErrorInfo};
227
233
        {Token, RestChars} when is_tuple(Token) -> 
 
234
            %% ?vtrace("get_all_tokens -> Token: ~p", [Token]),
228
235
            get_all_tokens(RestChars, [Token|Toks])
229
236
    end.
230
237