Index: ossp-pkg/sa/sa.h
RCS File: /v/ossp/cvs/ossp-pkg/sa/sa.h,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/sa/sa.h,v' 2>/dev/null
--- sa.h	2001/10/05 11:40:22	1.5
+++ sa.h	2001/10/05 11:49:10	1.6
@@ -44,34 +44,39 @@
 #define __SA_CONCAT(x) x
 #define SA_CONCAT(x,y) __SA_CONCAT(x)y
 #endif
-#define sa_addr_st   SA_CONCAT(SA_PREFIX,sa_addr_st)
-#define sa_addr_t    SA_CONCAT(SA_PREFIX,sa_addr_t)
-#define sa_rc_t      SA_CONCAT(SA_PREFIX,sa_rc_t)
-#define sa_st        SA_CONCAT(SA_PREFIX,sa_st)
-#define sa_t         SA_CONCAT(SA_PREFIX,sa_t)
-#define sa_u2a       SA_CONCAT(SA_PREFIX,sa_u2a)
-#define sa_s2a       SA_CONCAT(SA_PREFIX,sa_s2a)
-#define sa_a2u       SA_CONCAT(SA_PREFIX,sa_a2u)
-#define sa_a2s       SA_CONCAT(SA_PREFIX,sa_a2s)
-#define sa_create    SA_CONCAT(SA_PREFIX,sa_create)
-#define sa_destroy   SA_CONCAT(SA_PREFIX,sa_destroy)
-#define sa_timeout   SA_CONCAT(SA_PREFIX,sa_timeout)
-#define sa_buffers   SA_CONCAT(SA_PREFIX,sa_buffers)
-#define sa_bind      SA_CONCAT(SA_PREFIX,sa_bind)
-#define sa_connect   SA_CONCAT(SA_PREFIX,sa_connect)
-#define sa_listen    SA_CONCAT(SA_PREFIX,sa_listen)
-#define sa_accept    SA_CONCAT(SA_PREFIX,sa_accept)
-#define sa_getremote SA_CONCAT(SA_PREFIX,sa_getremote)
-#define sa_getlocal  SA_CONCAT(SA_PREFIX,sa_getlocal)
-#define sa_getfd     SA_CONCAT(SA_PREFIX,sa_getfd)
-#define sa_shutdown  SA_CONCAT(SA_PREFIX,sa_shutdown)
-#define sa_read      SA_CONCAT(SA_PREFIX,sa_read)
-#define sa_readfrom  SA_CONCAT(SA_PREFIX,sa_readfrom)
-#define sa_readline  SA_CONCAT(SA_PREFIX,sa_readline)
-#define sa_write     SA_CONCAT(SA_PREFIX,sa_write)
-#define sa_writeto   SA_CONCAT(SA_PREFIX,sa_writeto)
-#define sa_printf    SA_CONCAT(SA_PREFIX,sa_printf)
-#define sa_flush     SA_CONCAT(SA_PREFIX,sa_flush)
+#define sa_addr_st      SA_CONCAT(SA_PREFIX,sa_addr_st)
+#define sa_addr_t       SA_CONCAT(SA_PREFIX,sa_addr_t)
+#define sa_rc_t         SA_CONCAT(SA_PREFIX,sa_rc_t)
+#define sa_st           SA_CONCAT(SA_PREFIX,sa_st)
+#define sa_t            SA_CONCAT(SA_PREFIX,sa_t)
+#define sa_addr_create  SA_CONCAT(SA_PREFIX,sa_addr_create)
+#define sa_addr_destroy SA_CONCAT(SA_PREFIX,sa_addr_destroy)
+#define sa_addr_u2a     SA_CONCAT(SA_PREFIX,sa_addr_u2a)
+#define sa_addr_s2a     SA_CONCAT(SA_PREFIX,sa_addr_s2a)
+#define sa_addr_a2u     SA_CONCAT(SA_PREFIX,sa_addr_a2u)
+#define sa_addr_a2s     SA_CONCAT(SA_PREFIX,sa_addr_a2s)
+#define sa_create       SA_CONCAT(SA_PREFIX,sa_create)
+#define sa_destroy      SA_CONCAT(SA_PREFIX,sa_destroy)
+#define sa_type         SA_CONCAT(SA_PREFIX,sa_type)
+#define sa_timeout      SA_CONCAT(SA_PREFIX,sa_timeout)
+#define sa_buffers      SA_CONCAT(SA_PREFIX,sa_buffers)
+#define sa_getoption    SA_CONCAT(SA_PREFIX,sa_getoption)
+#define sa_setoption    SA_CONCAT(SA_PREFIX,sa_setoption)
+#define sa_bind         SA_CONCAT(SA_PREFIX,sa_bind)
+#define sa_connect      SA_CONCAT(SA_PREFIX,sa_connect)
+#define sa_listen       SA_CONCAT(SA_PREFIX,sa_listen)
+#define sa_accept       SA_CONCAT(SA_PREFIX,sa_accept)
+#define sa_getremote    SA_CONCAT(SA_PREFIX,sa_getremote)
+#define sa_getlocal     SA_CONCAT(SA_PREFIX,sa_getlocal)
+#define sa_getfd        SA_CONCAT(SA_PREFIX,sa_getfd)
+#define sa_shutdown     SA_CONCAT(SA_PREFIX,sa_shutdown)
+#define sa_read         SA_CONCAT(SA_PREFIX,sa_read)
+#define sa_readfrom     SA_CONCAT(SA_PREFIX,sa_readfrom)
+#define sa_readline     SA_CONCAT(SA_PREFIX,sa_readline)
+#define sa_write        SA_CONCAT(SA_PREFIX,sa_write)
+#define sa_writeto      SA_CONCAT(SA_PREFIX,sa_writeto)
+#define sa_printf       SA_CONCAT(SA_PREFIX,sa_printf)
+#define sa_flush        SA_CONCAT(SA_PREFIX,sa_flush)
 #endif
 
 /* socket address abstraction object type */
Index: ossp-pkg/sa/sa.pod
RCS File: /v/ossp/cvs/ossp-pkg/sa/sa.pod,v
rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/sa/sa.pod,v' 2>/dev/null
--- sa.pod	2001/10/02 18:47:47	1.3
+++ sa.pod	2001/10/05 11:49:10	1.4
@@ -43,24 +43,29 @@
 sa_t,
 sa_rc_t.
 
+=item B<Address Object Operations>:
+
+sa_addr_create,
+sa_addr_destroy.
+
 =item B<Address Operations>:
 
-sa_u2a,
-sa_s2a,
-sa_a2u,
-sa_a2s.
+sa_addr_u2a,
+sa_addr_s2a,
+sa_addr_a2u,
+sa_addr_a2s.
             
-=item B<Object Operations>:
+=item B<Socket Object Operations>:
 
 sa_create,
 sa_destroy. 
             
-=item B<Parameter Operations>:
+=item B<Socket Parameter Operations>:
 
 sa_timeout,
 sa_buffers. 
             
-=item B<Connection Operations>:
+=item B<Socket Connection Operations>:
 
 sa_bind,
 sa_connect,
@@ -71,14 +76,14 @@
 sa_getfd,
 sa_shutdown.
 
-=item B<Input/Output Operations>:
+=item B<Socket Input/Output Operations>:
             
 sa_read,
 sa_readfrom,
 sa_readline,
 sa_write,
 sa_writeto,
-sa_printf,
+sa_writef,
 sa_flush.   
 
 =back
@@ -120,7 +125,7 @@
 =item B<Convinience I/O Functions>
 
 If B<OSSP sa> is used for TCP-based stream I/O, for convinience reasons
-line reading (sa_readline(3)) and output formatting (sa_printf(3))
+line reading (sa_readline(3)) and output formatting (sa_writef(3))
 functions are provided, modelled after STDIO's fgets(3) and fprintf(3).
 
 =back
@@ -133,25 +138,37 @@
 
 =item B<sa_t>
 
+=item B<sa_rc_tt>
+
 =back
 
 =head1 FUNCTIONS
 
+=head2 Address Object Operations
+
+=over 4
+
+=item sa_rc_t B<sa_addr_create>(sa_addr_t **I<saa>);
+
+=item sa_rc_t B<sa_addr_destroy>(sa_addr_t *I<saa>);
+
+=back
+
 =head2 Address Operations
 
 =over 4
 
-=item sa_rc_t B<sa_u2a>(sa_addr_t **I<saa>, const char *I<uri>, ...);
+=item sa_rc_t B<sa_addr_u2a>(sa_addr_t *I<saa>, const char *I<uri>, ...);
 
-=item sa_rc_t B<sa_s2a>(sa_addr_t **I<saa>, const struct sockaddr *I<sabuf>, socklen_t I<salen>);
+=item sa_rc_t B<sa_addr_s2a>(sa_addr_t *I<saa>, const struct sockaddr *I<sabuf>, socklen_t I<salen>);
 
-=item sa_rc_t B<sa_a2u>(const sa_addr_t *I<saa>, char **I<uri>);
+=item sa_rc_t B<sa_addr_a2u>(sa_addr_t *I<saa>, char **I<uri>);
 
-=item sa_rc_t B<sa_a2s>(const sa_addr_t *I<saa>, struct sockaddr **I<sabuf>, socklen_t *I<salen>);
+=item sa_rc_t B<sa_addr_a2s>(sa_addr_t *I<saa>, struct sockaddr **I<sabuf>, socklen_t *I<salen>);
 
 =back
             
-=head2 Object Operations
+=head2 Socket Object Operations
 
 =over 4
 
@@ -161,17 +178,23 @@
 
 =back
             
-=head2 Parameter Operations
+=head2 Socket Parameter Operations
 
 =over 4
 
+=item sa_rc_t B<sa_type>(sa_t *I<sa>, sa_type_t I<type>);
+
 =item sa_rc_t B<sa_timeout>(sa_t *I<sa>, long I<sec>, long I<usec>);
 
 =item sa_rc_t B<sa_buffers>(sa_t *I<sa>, size_t I<rsize>, size_t I<wsize>);
 
+=item sa_rc_t B<sa_getoption>(sa_t *I<sa>, int I<optname>, void *I<optval>, socklen_t *I<optlen>);
+
+=item sa_rc_t B<sa_setoption>(sa_t *I<sa>, int I<optname>, const void *I<optval>, socklen_t I<optlen>);
+
 =back
-            
-=head2 Connection Operations
+
+=head2 Socket Connection Operations
 
 =over 4
 
@@ -193,7 +216,7 @@
 
 =back
 
-=head2 Input/Output Operations
+=head2 Socket Input/Output Operations
 
 =over 4
 
@@ -207,7 +230,7 @@
 
 =item sa_rc_t B<sa_writeto>(sa_t *I<sa>, const char *I<buf>, size_t I<buflen>, size_t *I<bufdone>, sa_addr_t *I<raddr>);
 
-=item sa_rc_t B<sa_printf>(sa_t *I<sa>, const char *I<fmt>, ...);
+=item sa_rc_t B<sa_writef>(sa_t *I<sa>, const char *I<fmt>, ...);
 
 =item sa_rc_t B<sa_flush>(sa_t *I<sa>);