Changeset 533

Timestamp:

04/14/04 13:00:41 (5 years ago)

Author:

jajcus

Message:

- ported to glib2

Files:

• trunk/src/stream.c (modified) (10 diffs)

trunk/src/stream.c

@@ -1 @@
-3 2004/03/17 22:40:02
+4 2004/04/14 11:00:41
-
-/*
@@ -82 +82 @@
-        }
-        s->ioch=g_io_channel_unix_new(fd);
+        g_io_channel_set_encoding(s->ioch,NULL,NULL);
+        g_io_channel_set_buffered(s->ioch,0);
-        s->sa.sin_family=AF_INET;
-        s->sa.sin_port=htons(port);
@@ -195 +197 @@
-int stream_io_read(GIOChannel *source,GIOCondition condition,gpointer data){
-Stream *s;
-
-
+
+
+
-
-        s=(Stream *)data;
@@ -208 +211 @@
-                s->read_buf_len=1024;
-        }
-
-
+
+
+
+
+
-                s->read_watch=0;
-                s->xs->f(XSTREAM_CLOSE,NULL,s);
-                return FALSE;
-        }
-
-
-
-
-
+
+
+
-        s->read_buf[br]=0;
-        debug("IN: %s",s->read_buf);
@@ -228 +232 @@
-Stream *s;
-char * str;
-
-
+
+
+
-
-        s=(Stream *)data;
@@ -235 +240 @@
-
-        if (s->write_buf && s->write_pos>=0 && s->write_len>=0){
-err=g_io_channel_write
+st=g_io_channel_write_chars
-                                        s->write_buf+s->write_pos,
-                                        s->write_len-s->write_pos,
-
-
+
+
+
+
-                        s->write_watch=0;
-                        s->xs->f(XSTREAM_CLOSE,NULL,s);
+                        if (error) g_error_free(error);
-                        return FALSE;
-                }
-
-
-
+
+
+
+
-                        return TRUE;
-                }
+                if (error) g_error_free(error);
+                error=NULL;
-                str=g_new(char,br+1);
-                g_assert(str!=NULL);
@@ -256 +267 @@
-                g_free(str);
-                s->write_pos+=br;
+                debug("write_pos: %i, write_len: %i, br: %i\n",s->write_pos,s->write_len,(int)br);
-                if (s->write_pos==s->write_len){
-                        s->write_watch=0;
@@ -268 +280 @@
-int stream_write_bytes(Stream *s,const char *buf,int l){
-time_t stream_flush_timeout;
+GIOStatus st;
+GError *error=NULL;
-
-        if (!l) return 0;
@@ -285 +299 @@
-                if (!s->write_len && l>MAX_WRITE_BUF){
-                        int pos=0;
-int written,err
+gsize written
-                        char *str;
-                        debug("Flushing data that don't fit into the write buffer.");
-                        while(pos<l){
-err=g_io_channel_write
+st=g_io_channel_write_chars
-                                                (gchar *)buf+pos,
-                                                l-pos,
-
-
-
+
+
+
+
+
-                                        return -2;
-                                }
+                                if (error) g_error_free(error);
+                                error=NULL;
-                                str=g_new(char,written+1);
-                                g_assert(str!=NULL);
@@ -371 +389 @@
-                char goodbye[]="</stream:stream>";
-                guint i,l;
-
-
+
+
+
-
-                i=0;
-                l=sizeof(goodbye);
-                do{
-
+
+
+
-                        l-=br;
-                        i+=br;
-err==G_IO_ERROR_AGAIN||(err=G_IO_ERROR_NONE
+st==G_IO_STATUS_AGAIN||(st=G_IO_STATUS_NORMAL
-                s->closing=1;
-        }