From 2b1924c2442eaf7342c8e992e96b59aa7798cc8d Mon Sep 17 00:00:00 2001 Message-Id: <2b1924c2442eaf7342c8e992e96b59aa7798cc8d.1718387853.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 11 May 2023 00:02:16 +0100 Subject: [PATCH] */*.3: Align arguments properly to the right of the opening `('. Organization: Straylight/Edgeware From: Mark Wooding This involves a little stunt roff, but we'll manage somehow. --- codec/url.3 | 5 +++-- sel/bres.3 | 14 ++++++++------ sel/conn.3 | 16 +++++++++------- sel/ident.3 | 18 ++++++++++-------- sel/sel.3 | 25 ++++++++++++++----------- sel/selbuf.3 | 5 +++-- sel/selpk.3 | 5 +++-- sel/sig.3 | 5 +++-- struct/sym.3 | 7 ++++--- sys/fdflags.3 | 7 ++++--- test/testrig.3 | 14 ++++++++------ trace/trace.3 | 18 +++++++++++------- ui/mdwopt.3 | 23 +++++++++++++---------- 13 files changed, 93 insertions(+), 69 deletions(-) diff --git a/codec/url.3 b/codec/url.3 index 7f6bcf0..f68bf33 100644 --- a/codec/url.3 +++ b/codec/url.3 @@ -23,8 +23,9 @@ url \- manipulation of form-urlencoded strings .B "#include " .BI "void url_initenc(url_ectx *" ctx ); -.BI "void url_enc(url_ectx *" ctx ", dstr *" d , -.BI " const char *" name ", const char *" value ); +.ds mT \fBvoid url_enc( +.BI "\*(mTurl_ectx *" ctx ", dstr *" d , +.BI "\h'\w'\*(mT'u'const char *" name ", const char *" value ); .BI "void url_initdec(url_dctx *" ctx ", const char *" p ); .BI "int url_dec(url_dctx *" ctx ", dstr *" n ", dstr *" v ); diff --git a/sel/bres.3 b/sel/bres.3 index ca58165..0a0dd7a 100644 --- a/sel/bres.3 +++ b/sel/bres.3 @@ -11,12 +11,14 @@ bres \- background name resolver .nf .B "#include " -.BI "void bres_byname(bres_client *" rc ", const char *" name , -.BI " void (*" func ")(struct hostent *" h ", void *" p ), -.BI " void *" p ); -.BI "void bres_byaddr(bres_client *" rc ", struct inaddr " addr , -.BI " void (*" func ")(struct hostent *" h ", void *" p ), -.BI " void *" p ); +.ds mT \fBvoid bres_byname( +.BI "\*(mTbres_client *" rc ", const char *" name , +.BI "\h'\w'\*(mT'u'void (*" func ")(struct hostent *" h ", void *" p ), +.BI "\h'\w'\*(mT'u'void *" p ); +.ds mT \fBvoid bres_byaddr( +.BI "\*(mTbres_client *" rc ", struct inaddr " addr , +.BI "\h'\w'\*(mT'u'void (*" func ")(struct hostent *" h ", void *" p ), +.BI "\h'\w'\*(mT'u'void *" p ); .BI "void bres_abort(bres_client *" rc ); .BI "void bres_exec(const char *" file ); .BI "void bres_init(sel_state *" sel ); diff --git a/sel/conn.3 b/sel/conn.3 index 1c91193..60008e5 100644 --- a/sel/conn.3 +++ b/sel/conn.3 @@ -9,14 +9,16 @@ conn \- selector for nonblocking connections .nf .B "#include " -.BI "int conn_fd(conn *" c ", sel_state *" s ", int " fd , -.BI " void (*" func ")(int " fd ", void *" p ), -.BI " void *" p ); +.ds mT \fBint conn_fd( +.BI "\*(mTconn *" c ", sel_state *" s ", int " fd , +.BI "\h'\w'\*(mT'u'void (*" func ")(int " fd ", void *" p ), +.BI "\h'\w'\*(mT'u'void *" p ); -.BI "int conn_init(conn *" c ", sel_state *" s ", int " fd , -.BI " struct sockaddr *" dst ", int " dsz , -.BI " void (*" func ")(int " fd ", void *" p ), -.BI " void *" p ); +.ds mT \fBint conn_init( +.BI "\*(mTconn *" c ", sel_state *" s ", int " fd , +.BI "\h'\w'\*(mT'u'struct sockaddr *" dst ", int " dsz , +.BI "\h'\w'\*(mT'u'void (*" func ")(int " fd ", void *" p ), +.BI "\h'\w'\*(mT'u'void *" p ); .BI "void conn_kill(conn *" c ); .fi diff --git a/sel/ident.3 b/sel/ident.3 index 5247bd4..c6c14f5 100644 --- a/sel/ident.3 +++ b/sel/ident.3 @@ -10,14 +10,16 @@ ident \- identd (RFC931) client .B "#include " .BI "void ident_abort(ident_request *" rq ); -.BI "void ident(ident_request *" rq ", sel_state *" s , -.BI " const struct sockaddr_in *" local , -.BI " const struct sockaddr_in *" remote , -.BI " void (*" func ")(ident_reply *" i ", void *" p ), -.BI " void *" p ); -.BI "void ident_socket(ident_request *" rq ", sel_state *" s ", int " sk , -.BI " void (*" func ")(ident_reply *" i ", void *" p ), -.BI " void *" p ); +.ds mT \fBvoid ident( +.BI "\*(mTident_request *" rq ", sel_state *" s , +.BI "\h'\w'\*(mT'u'const struct sockaddr_in *" local , +.BI "\h'\w'\*(mT'u'const struct sockaddr_in *" remote , +.BI "\h'\w'\*(mT'u'void (*" func ")(ident_reply *" i ", void *" p ), +.BI "\h'\w'\*(mT'u'void *" p ); +.ds mT \fBvoid ident_socket( +.BI "\*(mTident_request *" rq ", sel_state *" s ", int " sk , +.BI "\h'\w'\*(mT'u'void (*" func ")(ident_reply *" i ", void *" p ), +.BI "\h'\w'\*(mT'u'void *" p ); .fi .SH "DESCRIPTION" The diff --git a/sel/sel.3 b/sel/sel.3 index a1f86a5..0442b37 100644 --- a/sel/sel.3 +++ b/sel/sel.3 @@ -19,23 +19,26 @@ sel \- low level interface for waiting for I/O .BI "void sel_init(sel_state *" s ); -.BI "void sel_initfile(sel_state *" s ", sel_file *" f , -.BI " int " fd ", unsigned " mode , -.BI " void (*" func ")(int " fd ", unsigned " mode ", void *" p ), -.BI " void *" p ); +.ds mT \fBvoid sel_initfile( +.BI "\*(mTsel_state *" s ", sel_file *" f , +.BI "\h'\w'\*(mT'u'int " fd ", unsigned " mode , +.BI "\h'\w'\*(mT'u'void (*" func ")(int " fd ", unsigned " mode ", void *" p ), +.BI "\h'\w'\*(mT'u'void *" p ); .BI "void sel_addfile(sel_file *" f ); .BI "void sel_force(sel_file *" f ); .BI "void sel_rmfile(sel_file *" f ); -.BI "void sel_addtimer(sel_state *" s ", sel_timer *" t , -.BI " struct timeval *" tv , -.BI " void (*" func ")(struct timeval *" tv ", void *" p ), -.BI " void *" p ); +.ds mT \fBvoid sel_addtimer( +.BI "\*(mTsel_state *" s ", sel_timer *" t , +.BI "\h'\w'\*(mT'u'struct timeval *" tv , +.BI "\h'\w'\*(mT'u'void (*" func ")(struct timeval *" tv ", void *" p ), +.BI "\h'\w'\*(mT'u'void *" p ); .BI "void sel_rmtimer(sel_timer *" t ); -.BI "void sel_addhook(sel_state *" s ", sel_hook *" h , -.BI " sel_hookfn " before ", sel_hookfn " after , -.BI " void *" p ); +.ds mT \fBvoid sel_addhook( +.BI "\*(mTsel_state *" s ", sel_hook *" h , +.BI "\h'\w'\*(mT'u'sel_hookfn " before ", sel_hookfn " after , +.BI "\h'\w'\*(mT'u'void *" p ); .BI "void sel_rmhook(sel_hook *" h ); .BI "int sel_fdmerge(fd_set *" dest ", fd_set *" fd ", int " maxfd ); diff --git a/sel/selbuf.3 b/sel/selbuf.3 index cdf561b..a704366 100644 --- a/sel/selbuf.3 +++ b/sel/selbuf.3 @@ -14,8 +14,9 @@ selbuf \- line-buffering input selector .BI "void selbuf_enable(selbuf *" b ); .BI "void selbuf_disable(selbuf *" b ); .BI "void selbuf_setsize(selbuf *" b ", size_t " sz ); -.BI "void selbuf_init(selbuf *" b ", sel_state *" s ", int " fd , -.BI " lbuf_func *" func ", void *" p ); +.ds mT \fBvoid selbuf_init( +.BI "\*(mTselbuf *" b ", sel_state *" s ", int " fd , +.BI "\h'\w'\*(mT'u'lbuf_func *" func ", void *" p ); .BI "void selbuf_destroy(selbuf *" b ); .fi .SH DESCRIPTION diff --git a/sel/selpk.3 b/sel/selpk.3 index f0a56ee..1c8e6b1 100644 --- a/sel/selpk.3 +++ b/sel/selpk.3 @@ -14,8 +14,9 @@ selpk \- packet-buffering input selector .BI "void selpk_enable(selpk *" pk ); .BI "void selpk_disable(selpk *" pk ); .BI "void selpk_want(selpk *" pk ", size_t " sz ); -.BI "void selpk_init(selpk *" pk ", sel_state *" s ", int " fd , -.BI " pkbuf_func *" func ", void *" p ); +.ds mT \fBvoid selpk_init( +.BI "\*(mTselpk *" pk ", sel_state *" s ", int " fd , +.BI "\h'\w'\*(mT'u'pkbuf_func *" func ", void *" p ); .BI "void selpk_destroy(selpk *" b ); .fi .SH DESCRIPTION diff --git a/sel/sig.3 b/sel/sig.3 index a176e12..f9effa9 100644 --- a/sel/sig.3 +++ b/sel/sig.3 @@ -9,8 +9,9 @@ sig \- more controlled signal handling .nf .B "#include " -.BI "void sig_add(sig *" s ", int " n , -.BI " void (*" proc ")(int " n ", void *" p "), void *" p ); +.ds mT \fBvoid sig_add( +.BI "\*(mTsig *" s ", int " n , +.BI "\h'\w'\*(mT'u'void (*" proc ")(int " n ", void *" p "), void *" p ); .BI "void sig_remove(sig *" s ); .BI "void sig_init(sel_state *" s ); .fi diff --git a/struct/sym.3 b/struct/sym.3 index 80cb913..c566017 100644 --- a/struct/sym.3 +++ b/struct/sym.3 @@ -32,9 +32,10 @@ sym \- symbol table manager .BI "void sym_create(sym_table *" t ); .BI "void sym_destroy(sym_table *" t ); -.BI "void *sym_find(sym_table *" t , -.BI " const char *" n ", long " l , -.BI " size_t " sz ", unsigned *" f ); +.ds mT \fBvoid *sym_find( +.BI "\*(mTsym_table *" t , +.BI "\h'\w'\*(mT'u'const char *" n ", long " l , +.BI "\h'\w'\*(mT'u'size_t " sz ", unsigned *" f ); .BI "void sym_remove(sym_table *" t ", void *" b ); .BI "const char *SYM_NAME(const void *" p ); diff --git a/sys/fdflags.3 b/sys/fdflags.3 index 81f3d83..3fd51fc 100644 --- a/sys/fdflags.3 +++ b/sys/fdflags.3 @@ -19,9 +19,10 @@ fdflags \- set file and file descriptor flags .nf .B "#include " -.BI "int fdflags(int " fd , -.BI " unsigned " fbic ", unsigned " fxor , -.BI " unsigned " fdbic ", unsigned " fdxor ); +.ds mT \fBint fdflags( +.BI "\*(mTint " fd , +.BI "\h'\w'\*(mT'u'unsigned " fbic ", unsigned " fxor , +.BI "\h'\w'\*(mT'u'unsigned " fdbic ", unsigned " fdxor ); .fi .SH "DESCRIPTION" .B fdflags diff --git a/test/testrig.3 b/test/testrig.3 index 5a5e9ca..77cdfce 100644 --- a/test/testrig.3 +++ b/test/testrig.3 @@ -19,12 +19,14 @@ testrig \- generic test rig .nf .B "#include " -.BI "int test_do(const test_suite " suite [], -.BI " FILE *" fp , -.BI " test_results *" results ); -.BI "void test_run(int " argc ", char *" argv [], -.BI " const test_chunk " chunk [], -.BI " const char *" def ); +.ds mT \fBint test_do( +.BI "\*(mTconst test_suite " suite [], +.BI "\h'\w'\*(mT'u'FILE *" fp , +.BI "\h'\w'\*(mT'u'test_results *" results ); +.ds mT \fBvoid test_run( +.BI "\*(mTint " argc ", char *" argv [], +.BI "\h'\w'\*(mT'u'const test_chunk " chunk [], +.BI "\h'\w'\*(mT'u'const char *" def ); .fi .SH DESCRIPTION .SS Structure diff --git a/trace/trace.3 b/trace/trace.3 index 0a708bd..b541cb8 100644 --- a/trace/trace.3 +++ b/trace/trace.3 @@ -17,18 +17,22 @@ trace \- configurable tracing output .B "#include " .BI "void trace(unsigned " l ", const char *" f ", ...);" -.BI "void trace_block(unsigned " l ", const char *" s , -.BI " const void *" b ", size_t " sz ); +.ds mT \fBvoid trace_block( +.BI "\*(mTunsigned " l ", const char *" s , +.BI "\h'\w'\*(mT'u'const void *" b ", size_t " sz ); .BI "void trace_on(FILE *" fp ", unsigned " l ); -.BI "void trace_custom(void (*" func ")(const char *" buf , -.BI " size_t " sz ", void *" v ), -.BI " void *" v ); +.ds mT \fBvoid trace_custom( +.ds mU \*(mTvoid (*\fIfunc\fB)( +.BI "\*(mUconst char *" buf , +.BI "\h'\w'\*(mU'u'size_t " sz ", void *" v ), +.BI "\h'\w'\*(mT'u'void *" v ); .BI "void trace_level(unsigned " l ); .BI "unsigned tracing(void);" -.BI "unsigned traceopt(const trace_opt *" t ", const char *" p , -.BI " unsigned " f ", unsigned " bad ); +.ds mT \fBunsigned traceopt( +.BI "\*(mTconst trace_opt *" t ", const char *" p , +.BI "\h'\w'\*(mT'u'unsigned " f ", unsigned " bad ); .BI T( statements\fR... ) .BI "IF_TRACING(unsigned " l ", " statements\fR... ) diff --git a/ui/mdwopt.3 b/ui/mdwopt.3 index 11111aa..7afd2d2 100644 --- a/ui/mdwopt.3 +++ b/ui/mdwopt.3 @@ -7,20 +7,23 @@ mdwopt \- command-line option parser .nf .B "#include " -.BI "int mdwopt(int " argc ", char *const *" argv , -.BI " const char *" shortopt , -.BI " const struct option *" longopt ", int *" longind , -.BI " mdwopt_data *" data ", int " flags ); +.ds mT \fBint mdwopt( +.BI "\*(mTint " argc ", char *const *" argv , +.BI "\h'\w'\*(mT'u'const char *" shortopt , +.BI "\h'\w'\*(mT'u'const struct option *" longopt ", int *" longind , +.BI "\h'\w'\*(mT'u'mdwopt_data *" data ", int " flags ); .BI "int getopt(int " argc ", char *const *" argv ", const char *" o ); -.BI "int getopt_long(int " argc ", char *const *" argv , -.BI " const char * "shortopt , -.BI " const struct option *" longopt ", int *" longind ); +.ds mT \fBint getopt_long( +.BI "\*(mTint " argc ", char *const *" argv , +.BI "\h'\w'\*(mT'u'const char * "shortopt , +.BI "\h'\w'\*(mT'u'const struct option *" longopt ", int *" longind ); -.BI "int getopt_long_only(int " argc ", char *const *" argv , -.BI " const char * "shortopt , -.BI " const struct option *" longopt ", int *" longind ); +.ds mT \fBint getopt_long_only( +.BI "\*(mTint " argc ", char *const *" argv , +.BI "\h'\w'\*(mT'u'const char * "shortopt , +.BI "\h'\w'\*(mT'u'const struct option *" longopt ", int *" longind ); .fi .SH "OVERVIEW" The -- [mdw]