Branch: Tag:

2008-06-28

2008-06-28 16:37:03 by Martin Nilsson <mani@lysator.liu.se>

static -> protected

Rev: lib/modules/ADT.pmod/Heap.pike:1.12
Rev: lib/modules/ADT.pmod/Queue.pike:1.14
Rev: lib/modules/ADT.pmod/Relation.pmod/Binary.pike:1.15
Rev: lib/modules/ADT.pmod/Struct.pike:1.20
Rev: lib/modules/ADT.pmod/Table.pmod:1.29
Rev: lib/modules/ADT.pmod/Trie.pike:1.6
Rev: lib/modules/ADT.pmod/module.pmod:1.12
Rev: lib/modules/Arg.pmod:1.6
Rev: lib/modules/Array.pmod:1.110
Rev: lib/modules/Audio.pmod/Codec.pmod:1.11
Rev: lib/modules/Audio.pmod/Format.pmod/MP3.pike:1.4
Rev: lib/modules/Cache.pmod/Storage.pmod/Gdbm.pike:1.12
Rev: lib/modules/Cache.pmod/cache.pike:1.14
Rev: lib/modules/Calendar.pmod/Austrian.pmod:1.8
Rev: lib/modules/Calendar.pmod/Badi.pmod:1.8
Rev: lib/modules/Calendar.pmod/Coptic.pmod:1.8
Rev: lib/modules/Calendar.pmod/Discordian.pmod:1.12
Rev: lib/modules/Calendar.pmod/Event.pmod:1.24
Rev: lib/modules/Calendar.pmod/Gregorian.pmod:1.12
Rev: lib/modules/Calendar.pmod/ISO.pmod:1.11
Rev: lib/modules/Calendar.pmod/Islamic.pmod:1.11
Rev: lib/modules/Calendar.pmod/Julian.pmod:1.11
Rev: lib/modules/Calendar.pmod/Language.pmod:1.25
Rev: lib/modules/Calendar.pmod/Rule.pmod:1.3
Rev: lib/modules/Calendar.pmod/Stardate.pmod:1.17
Rev: lib/modules/Calendar.pmod/Swedish.pmod:1.9
Rev: lib/modules/Calendar.pmod/TZnames.pmod:1.16
Rev: lib/modules/Calendar.pmod/Time.pmod:1.42
Rev: lib/modules/Calendar.pmod/TimeRanges.pmod:1.35
Rev: lib/modules/Calendar.pmod/Timezone.pmod:1.44
Rev: lib/modules/Calendar.pmod/YMD.pike:1.33
Rev: lib/modules/Calendar.pmod/module.pmod:1.16
Rev: lib/modules/Calendar_I.pmod/ISO.pmod:1.12
Rev: lib/modules/Calendar_I.pmod/Stardate.pmod:1.5
Rev: lib/modules/Crypto.pmod/DSA.pike:1.8
Rev: lib/modules/Crypto.pmod/HMAC.pike:1.5
Rev: lib/modules/Crypto.pmod/Koremutake.pmod:1.4
Rev: lib/modules/Crypto.pmod/PGP.pmod:1.14
Rev: lib/modules/Crypto.pmod/Pipe.pike:1.9
Rev: lib/modules/Crypto.pmod/RSA.pike:1.11
Rev: lib/modules/Crypto.pmod/Random.pmod:1.19
Rev: lib/modules/Crypto.pmod/Substitution.pike:1.4
Rev: lib/modules/Debug.pmod/Subject.pike:1.9
Rev: lib/modules/Debug.pmod/Wrapper.pike:1.6
Rev: lib/modules/Filesystem.pmod/System.pike:1.20
Rev: lib/modules/Filesystem.pmod/Tar.pmod:1.30
Rev: lib/modules/Filesystem.pmod/module.pmod:1.26
Rev: lib/modules/GLU.pmod:1.16
Rev: lib/modules/GLUE.pmod/Driver.pmod/GTK.pike:1.6
Rev: lib/modules/GLUE.pmod/Driver.pmod/Interface.pike:1.3
Rev: lib/modules/GLUE.pmod/Driver.pmod/SDL.pike:1.6
Rev: lib/modules/GLUE.pmod/Events.pmod:1.4
Rev: lib/modules/GLUE.pmod/module.pmod:1.15
Rev: lib/modules/GTKSupport.pmod/pCtree.pike:1.8
Rev: lib/modules/GTKSupport.pmod/pDrawingArea.pike:1.9
Rev: lib/modules/Geography.pmod/Countries.pmod:1.20
Rev: lib/modules/Geography.pmod/Position.pike:1.18
Rev: lib/modules/Getopt.pmod:1.33
Rev: lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike:1.20
Rev: lib/modules/Graphics.pmod/Graph.pmod/module.pmod:1.9
Rev: lib/modules/Graphics.pmod/Graph.pmod/polyline.pike:1.7
Rev: lib/modules/Int.pmod:1.10
Rev: lib/modules/Local.pmod:1.11
Rev: lib/modules/Locale.pmod/Charset.pmod/Tables.pmod/iso88591.pmod:1.3
Rev: lib/modules/Locale.pmod/Charset.pmod/module.pmod:1.57
Rev: lib/modules/Locale.pmod/Language.pmod/nld.pmod:1.2
Rev: lib/modules/Locale.pmod/module.pmod:1.25
Rev: lib/modules/MIME.pmod/ext_to_media_type.pmod:1.7
Rev: lib/modules/MIME.pmod/module.pmod:1.20
Rev: lib/modules/Mapping.pmod:1.10
Rev: lib/modules/Parser.pmod/C.pmod:1.50
Rev: lib/modules/Parser.pmod/LR.pmod/GrammarParser.pmod:1.6
Rev: lib/modules/Parser.pmod/LR.pmod/module.pmod:1.17
Rev: lib/modules/Parser.pmod/Pike.pmod:1.41
Rev: lib/modules/Parser.pmod/RCS.pike:1.39
Rev: lib/modules/Parser.pmod/SGML.pike:1.3
Rev: lib/modules/Parser.pmod/XML.pmod/DOM.pmod:1.14
Rev: lib/modules/Parser.pmod/XML.pmod/NSTree.pmod:1.20
Rev: lib/modules/Parser.pmod/XML.pmod/Tree.pmod:1.72
Rev: lib/modules/Parser.pmod/XML.pmod/Validating.pike:1.14
Rev: lib/modules/Parser.pmod/module.pmod:1.25
Rev: lib/modules/Pike.pmod/module.pmod:1.19
Rev: lib/modules/Process.pmod:1.54
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Bencoding.pmod:1.5
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Peer.pike:1.21
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/PeerID.pmod:1.8
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Port.pike:1.7
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Torrent.pike:1.36
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/module.pmod:1.4
Rev: lib/modules/Protocols.pmod/DNS.pmod:1.96
Rev: lib/modules/Protocols.pmod/DNS_SD.pmod:1.2
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Query.pike:1.93
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/Port.pike:1.9
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/Request.pike:1.50
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/SSLPort.pike:1.14
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Session.pike:1.22
Rev: lib/modules/Protocols.pmod/HTTP.pmod/module.pmod:1.56
Rev: lib/modules/Protocols.pmod/Ident.pmod:1.12
Rev: lib/modules/Protocols.pmod/LDAP.pmod/client.pike:1.113
Rev: lib/modules/Protocols.pmod/LDAP.pmod/ldap_privates.pmod:1.15
Rev: lib/modules/Protocols.pmod/LDAP.pmod/module.pmod:1.32
Rev: lib/modules/Protocols.pmod/LDAP.pmod/protocol.pike:1.21
Rev: lib/modules/Protocols.pmod/LMTP.pmod:1.12
Rev: lib/modules/Protocols.pmod/Line.pmod:1.23
Rev: lib/modules/Protocols.pmod/LysKOM.pmod/Raw.pike:1.19
Rev: lib/modules/Protocols.pmod/OBEX.pmod:1.8
Rev: lib/modules/Protocols.pmod/SMTP.pmod/module.pmod:1.46
Rev: lib/modules/Protocols.pmod/SNMP.pmod/protocol.pike:1.19
Rev: lib/modules/Protocols.pmod/TELNET.pmod:1.28
Rev: lib/modules/Protocols.pmod/X.pmod/Extensions.pmod:1.16
Rev: lib/modules/Protocols.pmod/XMLRPC.pmod/module.pmod:1.30
Rev: lib/modules/Remote.pmod/module.pmod:1.8
Rev: lib/modules/SSL.pmod/Cipher.pmod:1.16
Rev: lib/modules/SSL.pmod/connection.pike:1.42
Rev: lib/modules/SSL.pmod/context.pike:1.37
Rev: lib/modules/SSL.pmod/session.pike:1.37
Rev: lib/modules/SSL.pmod/sslfile.pike:1.110
Rev: lib/modules/Sql.pmod/Sql.pike:1.92
Rev: lib/modules/Sql.pmod/mysql.pike:1.41
Rev: lib/modules/Sql.pmod/postgres.pike:1.28
Rev: lib/modules/Sql.pmod/rsql.pike:1.13
Rev: lib/modules/Sql.pmod/sql_result.pike:1.18
Rev: lib/modules/Sql.pmod/sql_util.pmod:1.21
Rev: lib/modules/Sql.pmod/tds.pike:1.24
Rev: lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod:1.24
Rev: lib/modules/Standards.pmod/ASN1.pmod/Types.pmod:1.45
Rev: lib/modules/Standards.pmod/EXIF.pmod:1.29
Rev: lib/modules/Standards.pmod/FIPS10_4.pmod:1.4
Rev: lib/modules/Standards.pmod/ID3.pmod:1.24
Rev: lib/modules/Standards.pmod/IDNA.pmod:1.9
Rev: lib/modules/Standards.pmod/IIM.pmod:1.8
Rev: lib/modules/Standards.pmod/ISO639_2.pmod:1.19
Rev: lib/modules/Standards.pmod/URI.pike:1.28
Rev: lib/modules/Standards.pmod/UUID.pmod:1.17
Rev: lib/modules/Standards.pmod/XML.pmod/Wix.pmod:1.27
Rev: lib/modules/Stdio.pmod/FakeFile.pike:1.16
Rev: lib/modules/Stdio.pmod/Readline.pike:1.60
Rev: lib/modules/Stdio.pmod/Terminfo.pmod:1.27
Rev: lib/modules/Stdio.pmod/module.pmod:1.238
Rev: lib/modules/String.pmod/HTML.pmod:1.7
Rev: lib/modules/String.pmod/module.pmod:1.29
Rev: lib/modules/Thread.pmod:1.45
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/CExtractor.pmod:1.28
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/DocParser.pmod:1.62
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeExtractor.pmod:1.40
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod:1.37
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike:1.52
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/ProcessXML.pmod:1.71
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/module.pmod:1.10
Rev: lib/modules/Tools.pmod/Hilfe.pmod:1.156
Rev: lib/modules/Tools.pmod/Install.pmod:1.35
Rev: lib/modules/Tools.pmod/Legal.pmod/Copyright.pmod:1.12
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/GPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/LGPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/MPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Monger.pmod/MongerDeveloper.pike:1.8
Rev: lib/modules/Tools.pmod/Monger.pmod/MongerUser.pike:1.8
Rev: lib/modules/Tools.pmod/Monger.pmod/module.pmod:1.3
Rev: lib/modules/Tools.pmod/PEM.pmod:1.14
Rev: lib/modules/Tools.pmod/PV.pike:1.10
Rev: lib/modules/Tools.pmod/Shoot.pmod/module.pmod:1.20
Rev: lib/modules/Tools.pmod/Standalone.pmod/assemble_autodoc.pike:1.35
Rev: lib/modules/Tools.pmod/Standalone.pmod/dump.pike:1.10
Rev: lib/modules/Tools.pmod/Standalone.pmod/join_autodoc.pike:1.19
Rev: lib/modules/Tools.pmod/Standalone.pmod/pmar_install.pike:1.8
Rev: lib/modules/Tools.pmod/Standalone.pmod/precompile.pike:1.2
Rev: lib/modules/Tools.pmod/Standalone.pmod/rsqld.pike:1.12
Rev: lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike:1.136
Rev: lib/modules/Tools.pmod/Testsuite.pmod:1.9
Rev: lib/modules/Tools.pmod/sed.pmod:1.6
Rev: lib/modules/Web.pmod/CGI.pmod/Request.pike:1.4
Rev: lib/modules/Web.pmod/Crawler.pmod:1.26
Rev: lib/modules/Web.pmod/OWL.pike:1.7
Rev: lib/modules/Web.pmod/RDF.pike:1.47
Rev: lib/modules/Web.pmod/RSS.pmod:1.7
Rev: lib/modules/Yabu.pmod/module.pmod:1.30
Rev: lib/modules/_Image.pmod/Dims.pmod:1.10
Rev: lib/modules/_Image.pmod/Fonts.pmod:1.13
Rev: lib/modules/_Image.pmod/module.pmod:1.47
Rev: lib/modules/_Image_DWG.pmod:1.5
Rev: lib/modules/_Image_PS.pmod:1.15
Rev: lib/modules/_Image_XCF.pmod:1.25

1:   /* -  * $Id: Line.pmod,v 1.22 2003/04/07 17:12:02 nilsson Exp $ +  * $Id: Line.pmod,v 1.23 2008/06/28 16:36:56 nilsson Exp $    *    * Line-buffered protocol handling.    *
11:   //! Simple nonblocking line-oriented I/O.   class simple   { -  static object con; +  protected object con;       //! The sequence separating lines from eachother. "\r\n" by default. -  static constant line_separator = "\r\n"; +  protected constant line_separator = "\r\n";       //! If this variable has been set, multiple lines will be accumulated,    //! until a line with a single @expr{"."@} (period) is received.
46:    //!    void handle_command(string line);    -  static int timeout; // Idle time before timeout. -  static int timeout_time; // Time at which next timeout will occur. +  protected int timeout; // Idle time before timeout. +  protected int timeout_time; // Time at which next timeout will occur.       //! Queue some data to send.    //!    //! @seealso    //! @[handle_command()], @[handle_data()], @[disconnect()]    //! -  static void send(string s) +  protected void send(string s)    {    send_q->put(s);    con->set_write_callback(write_callback);
69:    //! @seealso    //! @[create()], @[touch_time()]    //! -  static void do_timeout() +  protected void do_timeout()    {    if (con) {    catch {
85:    }    }    -  static void _timeout_cb() +  protected void _timeout_cb()    {    if (timeout > 0) {    // Timeouts are enabled.
114:    }    }    -  static string multi_line_buffer = ""; -  static void _handle_command(string line) +  protected string multi_line_buffer = ""; +  protected void _handle_command(string line)    {    if (handle_data) {    if (line != ".") {
132:    }    }    -  static string read_buffer = ""; +  protected string read_buffer = "";       //! Read a line from the input.    //!
146:    //! @seealso    //! @[handle_command()], @[line_separator]    //! -  static string read_line() +  protected string read_line()    {    // FIXME: Should probably keep track of where the search ended last time.    int i = search(read_buffer, line_separator);
168:    //! @seealso    //! @[handle_data()], @[handle_command()], @[read_line()]    //! -  static void read_callback(mixed ignored, string data) +  protected void read_callback(mixed ignored, string data)    {    touch_time();   
191:    //!    object(ADT.Queue) send_q = ADT.Queue();    -  static string write_buffer = ""; -  static void write_callback(mixed ignored) +  protected string write_buffer = ""; +  protected void write_callback(mixed ignored)    {    touch_time();   
267:    //! The default action is to shut down the connection on this side    //! as well.    //! -  static void close_callback() +  protected void close_callback()    {    if (handle_data || sizeof(read_buffer) || sizeof(multi_line_buffer)) {    werror("close_callback(): Unexpected close!\n");
382:    handle_line(line);    }    -  static void read_callback(mixed ignored, string data) +  protected void read_callback(mixed ignored, string data)    {    touch_time();