Browse Source

signal EOF properly

master
Felix von Leitner 16 years ago
parent
commit
9fbd2b60cc
5 changed files with 8 additions and 10 deletions
  1. +2
    -2
      buffer/buffer_get_new_token_sa.3
  2. +2
    -2
      buffer/buffer_get_token_sa.3
  3. +1
    -1
      buffer/buffer_get_token_sa.c
  4. +2
    -2
      buffer/buffer_getline_sa.3
  5. +1
    -3
      buffer/buffer_getnewline_sa.3

+ 2
- 2
buffer/buffer_get_new_token_sa.3 View File

@ -18,9 +18,9 @@ If reading from the buffer or allocating memory fails,
buffer_get_new_token_sa returns -1 and sets \fIerrno\fR appropriately. At
that point \fIsa\fR may already contain a partial token.
On success, buffer_get_new_token_sa returns 0.
If you want to read from a non-blocking socket, use buffer_get_token_sa
instead.
.SH "RETURN VALUE"
-1 on error (setting errno), 0 on EOF, 1 when successful.
.SH "SEE ALSO"
buffer_getline_sa(3), buffer_get_token(3), buffer(3)

+ 2
- 2
buffer/buffer_get_token_sa.3 View File

@ -17,8 +17,8 @@ previous content of \fIsa\fR. That delimiter is also appended to
If reading from the buffer or allocating memory fails,
buffer_get_token_sa returns -1 and sets \fIerrno\fR appropriately. At
that point \fIsa\fR may already contain a partial token.
On success, buffer_get_token_sa returns 0.
.SH "RETURN VALUE"
-1 on error (setting errno), 0 on EOF, 1 when successful.
.SH RATIONALE
buffer_get_token_sa appends instead of overwriting so it can be used on
non-blocking sockets (these signal error and set \fIerrno\fR to EAGAIN;


+ 1
- 1
buffer/buffer_get_token_sa.c View File

@ -16,7 +16,7 @@ int buffer_get_token_sa(buffer* b,stralloc* sa,
stralloc_append(sa,&x);
if (byte_chr(charset,setlen,x)<setlen) break;
}
return 0;
return 1;
nomem:
errno=ENOMEM;
return -1;


+ 2
- 2
buffer/buffer_getline_sa.3 View File

@ -16,8 +16,8 @@ If reading from the buffer or allocating memory fails,
buffer_getline_sa returns -1 and sets \fIerrno\fR appropriately. At
that point \fIsa\fR may be empty or it may already contain a partial
token.
On success, buffer_getline_sa returns 0.
.SH "RETURN VALUE"
-1 on error (setting errno), 0 on EOF, 1 when successful.
.SH RATIONALE
buffer_getline_sa appends instead of overwriting so it can be used on
non-blocking sockets (these signal error and set \fIerrno\fR to EAGAIN;


+ 1
- 3
buffer/buffer_getnewline_sa.3 View File

@ -17,10 +17,8 @@ buffer_getnewline_sa returns -1 and sets \fIerrno\fR appropriately. At
that point \fIsa\fR may be empty or it may already contain a partial
token.
On success, buffer_getnewline_sa returns 0.
To read from a non-blocking socket, use buffer_getline_sa.
.SH "RETURN VALUE"
0 on success, -1 on error (setting \fIerrno\fR)
-1 on error (setting errno), 0 on EOF, 1 when successful.
.SH "SEE ALSO"
buffer_get_token_sa(3), buffer(3)

Loading…
Cancel
Save