go-xmpp2: comparison structs.go

equal deleted inserted replaced

-:acca351fb8f0
+:e619e18dcec3
 // This file contains data structures.
 import (
 	"bytes"
+	"encoding/xml"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
-	"os"
 	"regexp"
 	"strings"
-	"xml"
 )
 // JID represents an entity that can communicate with other
 // entities. It looks like node@domain/resource. Node and resource are
 // sometimes optional.
 	Type string `xml:"attr"`
 	// Any nested element, if present.
 	Any *Generic
 }
-var _ os.Error = &Error{}
+var _ error = &Error{}
 // Used for resource binding as a nested element inside <iq/>.
 type bindIq struct {
 	XMLName  xml.Name `xml:"urn:ietf:params:xml:ns:xmpp-bind bind"`
 	Resource *string  `xml:"resource"`
 	jid.Domain = parts[3]
 	jid.Resource = parts[5]
 	return true
 }
-func (s *stream) MarshalXML() ([]byte, os.Error) {
+func (s *stream) MarshalXML() ([]byte, error) {
 	buf := bytes.NewBuffer(nil)
 	buf.WriteString("<stream:stream")
 	writeField(buf, "xmlns", "jabber:client")
 	writeField(buf, "xmlns:stream", NsStream)
 	writeField(buf, "to", s.To)
 func (s *stream) String() string {
 	result, _ := s.MarshalXML()
 	return string(result)
 }
-func parseStream(se xml.StartElement) (*stream, os.Error) {
+func parseStream(se xml.StartElement) (*stream, error) {
 	s := &stream{}
 	for _, attr := range se.Attr {
 		switch strings.ToLower(attr.Name.Local) {
 		case "to":
 			s.To = attr.Value
 		}
 	}
 	return s, nil
 }
-func (s *streamError) MarshalXML() ([]byte, os.Error) {
+func (s *streamError) MarshalXML() ([]byte, error) {
 	buf := bytes.NewBuffer(nil)
 	buf.WriteString("<stream:error>")
 	xml.Marshal(buf, s.Any)
 	if s.Text != nil {
 		xml.Marshal(buf, s.Text)
 	}
 	buf.WriteString("</stream:error>")
 	return buf.Bytes(), nil
 }
-func (e *errText) MarshalXML() ([]byte, os.Error) {
+func (e *errText) MarshalXML() ([]byte, error) {
 	buf := bytes.NewBuffer(nil)
 	buf.WriteString("<text")
 	writeField(buf, "xmlns", NsStreams)
 	writeField(buf, "xml:lang", e.Lang)
 	buf.WriteString(">")
 	return fmt.Sprintf("<%s %s>%s%s</%s %s>", u.XMLName.Space,
 		u.XMLName.Local, sub, u.Chardata, u.XMLName.Space,
 		u.XMLName.Local)
 }
-func marshalXML(st Stanza) ([]byte, os.Error) {
+func marshalXML(st Stanza) ([]byte, error) {
 	buf := bytes.NewBuffer(nil)
 	buf.WriteString("<")
 	buf.WriteString(st.GetName())
 	if st.GetTo() != "" {
 		writeField(buf, "to", st.GetTo())
 	buf.WriteString(st.GetName())
 	buf.WriteString(">")
 	return buf.Bytes(), nil
 }
-func (er *Error) String() string {
+func (er *Error) Error() string {
 	buf := bytes.NewBuffer(nil)
 	xml.Marshal(buf, er)
 	return buf.String()
 }
 func (m *Message) innerxml() string {
 	return m.Innerxml
 }
-func (m *Message) MarshalXML() ([]byte, os.Error) {
+func (m *Message) MarshalXML() ([]byte, error) {
 	return marshalXML(m)
 }
 func (p *Presence) GetName() string {
 	return "presence"
 func (p *Presence) innerxml() string {
 	return p.Innerxml
 }
-func (p *Presence) MarshalXML() ([]byte, os.Error) {
+func (p *Presence) MarshalXML() ([]byte, error) {
 	return marshalXML(p)
 }
 func (iq *Iq) GetName() string {
 	return "iq"
 func (iq *Iq) innerxml() string {
 	return iq.Innerxml
 }
-func (iq *Iq) MarshalXML() ([]byte, os.Error) {
+func (iq *Iq) MarshalXML() ([]byte, error) {
 	return marshalXML(iq)
 }
 // Parse a string into a struct implementing Stanza -- this will be
 // either an Iq, a Message, or a Presence.
-func ParseStanza(str string) (Stanza, os.Error) {
+func ParseStanza(str string) (Stanza, error) {
 	r := strings.NewReader(str)
 	p := xml.NewParser(r)
 	tok, err := p.Token()
 	if err != nil {
 		return nil, err
 	}
 	se, ok := tok.(xml.StartElement)
 	if !ok {
-		return nil, os.NewError("Not a start element")
+		return nil, errors.New("Not a start element")
 	}
 	var stan Stanza
 	switch se.Name.Local {
 	case "iq":
 		stan = &Iq{}
 	case "message":
 		stan = &Message{}
 	case "presence":
 		stan = &Presence{}
 	default:
-		return nil, os.NewError("Not iq, message, or presence")
+		return nil, errors.New("Not iq, message, or presence")
 	}
 	err = p.Unmarshal(stan, &se)
 	if err != nil {
 		return nil, err
 	}

changeset 74	e619e18dcec3
parent 72	53f15893a1a7
child 75	03a923eb5c01