Author: iratqq
Date: Sun Mar 15 23:03:47 2009
New Revision: 5894
Modified:
trunk/scm/fileio.scm
trunk/scm/http-client.scm
Log:
* scm/fileio.scm:
- Take 'file-' prefix.
* scm/http-client.scm (http:socket-ready?):
- Sync api.
Modified: trunk/scm/fileio.scm
==============================================================================
--- trunk/scm/fileio.scm (original)
+++ trunk/scm/fileio.scm Sun Mar 15 23:03:47 2009
@@ -36,20 +36,20 @@
(define file-bufsiz 16384)
-(define open-flags-alist (file-open-flags?))
-(define open-mode-alist (file-open-mode?))
-(define poll-flags-alist (file-poll-flags?))
+(define file-open-flags-alist (file-open-flags?))
+(define file-open-mode-alist (file-open-mode?))
+(define file-poll-flags-alist (file-poll-flags?))
-(define (fileio-set-flag l alist)
+(define (file-set-flag l alist)
(apply logior
(map (lambda (s)
(assq-cdr s alist))
l)))
-(define (open-flags-number l)
+(define (file-open-flags-number l)
(fileio-set-flag l open-flags-alist))
-(define (open-mode-number l)
+(define (file-open-mode-number l)
(fileio-set-flag l open-mode-alist))
-(define (poll-flags-number l)
+(define (file-poll-flags-number l)
(fileio-set-flag l poll-flags-alist))
(define (string->file-buf str)
Modified: trunk/scm/http-client.scm
==============================================================================
--- trunk/scm/http-client.scm (original)
+++ trunk/scm/http-client.scm Sun Mar 15 23:03:47 2009
@@ -62,7 +62,7 @@
(define (http:socket-ready? port)
(let* ((fd (fd? port))
- (fds (list (cons fd (assq-cdr '$POLLIN poll-flags-alist))))
+ (fds (list (cons fd (assq-cdr '$POLLIN file-poll-flags-alist))))
(ret (file-poll fds http-timeout)))
(cond ((not ret)
(uim-notify-fatal (N_ "socket error"))
