From 08f3c0da0ae23a6b11aa37a606c0cdb76b6a60af Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 19 Aug 2012 00:10:48 +0200 Subject: [PATCH] libc: Comment out documentation of svc_control() which we don't have. --- Makefile_upgrade.inc | 2 + lib/libc/rpc/Makefile.inc | 2 +- lib/libc/rpc/rpc_svc_create.3 | 124 +++++++++++++++++----------------- 3 files changed, 65 insertions(+), 63 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 4646c69717..65c17329dd 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2030,6 +2030,8 @@ TO_REMOVE+=/usr/include/netgraph7/ng_tty.h TO_REMOVE+=/etc/pam.d/gdm TO_REMOVE+=/etc/pam.d/kde TO_REMOVE+=/etc/rc.d/vfs_accounting +TO_REMOVE+=/usr/share/man/cat3/svc_control.3.gz +TO_REMOVE+=/usr/share/man/man3/svc_control.3.gz .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/libdata/stallion/2681.sys diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index 7ab8ff01cb..220098e16f 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -149,7 +149,6 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \ rpc_svc_calls.3 svc_pollset.3 \ rpc_svc_calls.3 svc_run.3 \ rpc_svc_calls.3 svc_sendreply.3 \ - rpc_svc_create.3 svc_control.3 \ rpc_svc_create.3 svc_create.3 \ rpc_svc_create.3 svc_destroy.3 \ rpc_svc_create.3 svc_dg_create.3 \ @@ -177,4 +176,5 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \ rpcbind.3 rpcb_rmtcall.3 \ rpcbind.3 rpcb_set.3 \ rpcbind.3 rpcb_unset.3 +# rpc_svc_create.3 svc_control.3 \ .endif diff --git a/lib/libc/rpc/rpc_svc_create.3 b/lib/libc/rpc/rpc_svc_create.3 index d47be2b292..26a2884def 100644 --- a/lib/libc/rpc/rpc_svc_create.3 +++ b/lib/libc/rpc/rpc_svc_create.3 @@ -8,7 +8,7 @@ .Os .Sh NAME .Nm rpc_svc_create , -.Nm svc_control , +.\".Nm svc_control , .Nm svc_create , .Nm svc_destroy , .Nm svc_dg_create , @@ -22,8 +22,8 @@ .Lb libc .Sh SYNOPSIS .In rpc/rpc.h -.Ft bool_t -.Fn svc_control "SVCXPRT *svc" "const u_int req" "void *info" +.\".Ft bool_t +.\".Fn svc_control "SVCXPRT *svc" "const u_int req" "void *info" .Ft int .Fn svc_create "void (*dispatch)(struct svc_req *, SVCXPRT *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype" .Ft SVCXPRT * @@ -54,65 +54,65 @@ for the definition of the .Vt SVCXPRT data structure. .Bl -tag -width XXXXX -.It Fn svc_control -A function to change or retrieve various information -about a service object. -The -.Fa req -argument -indicates the type of operation and -.Fa info -is a pointer to the information. -The supported values of -.Fa req , -their argument types, and what they do are: -.Bl -tag -width SVCGET_XID -.It Dv SVCGET_VERSQUIET -If a request is received for a program number -served by this server but the version number -is outside the range registered with the server, -an -.Dv RPC_PROGVERSMISMATCH -error will normally -be returned. -The -.Fa info -argument -should be a pointer to an -integer. -Upon successful completion of the -.Dv SVCGET_VERSQUIET -request, -.Fa *info -contains an -integer which describes the server's current -behavior: 0 indicates normal server behavior -(that is, an -.Dv RPC_PROGVERSMISMATCH -error -will be returned); 1 indicates that the out of -range request will be silently ignored. -.It Dv SVCSET_VERSQUIET -If a request is received for a program number -served by this server but the version number -is outside the range registered with the server, -an -.Dv RPC_PROGVERSMISMATCH -error will normally -be returned. -It is sometimes desirable to -change this behavior. -The -.Fa info -argument -should be a -pointer to an integer which is either 0 -(indicating normal server behavior - an -.Dv RPC_PROGVERSMISMATCH -error will be returned), -or 1 (indicating that the out of range request -should be silently ignored). -.El +.\".It Fn svc_control +.\"A function to change or retrieve various information +.\"about a service object. +.\"The +.\".Fa req +.\"argument +.\"indicates the type of operation and +.\".Fa info +.\"is a pointer to the information. +.\"The supported values of +.\".Fa req , +.\"their argument types, and what they do are: +.\".Bl -tag -width SVCGET_XID +.\".It Dv SVCGET_VERSQUIET +.\"If a request is received for a program number +.\"served by this server but the version number +.\"is outside the range registered with the server, +.\"an +.\".Dv RPC_PROGVERSMISMATCH +.\"error will normally +.\"be returned. +.\"The +.\".Fa info +.\"argument +.\"should be a pointer to an +.\"integer. +.\"Upon successful completion of the +.\".Dv SVCGET_VERSQUIET +.\"request, +.\".Fa *info +.\"contains an +.\"integer which describes the server's current +.\"behavior: 0 indicates normal server behavior +.\"(that is, an +.\".Dv RPC_PROGVERSMISMATCH +.\"error +.\"will be returned); 1 indicates that the out of +.\"range request will be silently ignored. +.\".It Dv SVCSET_VERSQUIET +.\"If a request is received for a program number +.\"served by this server but the version number +.\"is outside the range registered with the server, +.\"an +.\".Dv RPC_PROGVERSMISMATCH +.\"error will normally +.\"be returned. +.\"It is sometimes desirable to +.\"change this behavior. +.\"The +.\".Fa info +.\"argument +.\"should be a +.\"pointer to an integer which is either 0 +.\"(indicating normal server behavior - an +.\".Dv RPC_PROGVERSMISMATCH +.\"error will be returned), +.\"or 1 (indicating that the out of range request +.\"should be silently ignored). +.\".El .It Fn svc_create The .Fn svc_create -- 2.41.0