Various pages: Consistently use 'unsigned int'
PATCH 1/1 Various pages: Consistently use 'unsigned int'
$ find man? -type f \ |xargs sed -i \ -e 's/unsigned \*/unsigned int */g' -e 's/unsigned "/unsigned int "/g';
Signed-off-by Alejandro Colomar <[email protected]>
--- man2/getcpu.2 | 4 ++-- man2/io_setup.2 | 2 +- man2/mbind.2 | 2 +- man3/cfree.3 | 2 +- man3/des_crypt.3 | 8 ++++---- man3/getrpcport.3 | 2 +- man3/random.3 | 4 ++-- man3/xdr.3 | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-)
man2/getcpu.2 +2 -2
@@ -16,8 +16,8 @@ getcpu \- determine CPU and NUMA node on which the calling thread is running .nf .B #include <linux/getcpu.h> .PP -.BI "int getcpu(unsigned *" cpu ", unsigned *" node \ -", struct getcpu_cache *" tcache ); +.BI "int getcpu(unsigned int *" cpu ", unsigned int *" node , +.BI " struct getcpu_cache *" tcache ); .fi .SH DESCRIPTION The
man2/io_setup.2 +1 -1
@@ -11,7 +11,7 @@ io_setup \- create an asynchronous I/O context .nf .BR "#include <linux/aio_abi.h>" " /* Defines needed types */" .PP -.BI "long io_setup(unsigned " nr_events ", aio_context_t *" ctx_idp ); +.BI "long io_setup(unsigned int " nr_events ", aio_context_t *" ctx_idp ); .fi .PP .IR Note :
man2/mbind.2 +1 -1
@@ -41,7 +41,7 @@ mbind \- set memory policy for a memory range .PP .BI "long mbind(void *" addr ", unsigned long " len ", int " mode , .BI " const unsigned long *" nodemask ", unsigned long " maxnode , -.BI " unsigned " flags ); +.BI " unsigned int " flags ); .PP Link with \fI\-lnuma\fP. .fi
man3/cfree.3 +1 -1
@@ -36,7 +36,7 @@ cfree \- free allocated memory .BI "void cfree(void *" ptr ); .PP /* In SCO OpenServer */ -.BI "void cfree(char *" ptr ", unsigned " num ", unsigned " size ); +.BI "void cfree(char *" ptr ", unsigned int " num ", unsigned int " size ); .PP /* In Solaris watchmalloc.so.1 */ .BI "void cfree(void *" ptr ", size_t " nelem ", size_t " elsize );
man3/des_crypt.3 +4 -4
@@ -21,11 +21,11 @@ DES encryption .\" .B #include <des_crypt.h> .B #include <rpc/des_crypt.h> .PP -.BI "int ecb_crypt(char *" key ", char *" data ", unsigned " datalen , -.BI " unsigned " mode ); +.BI "int ecb_crypt(char *" key ", char *" data ", unsigned int " datalen , +.BI " unsigned int " mode ); .PP -.BI "int cbc_crypt(char *" key ", char *" data ", unsigned " datalen , -.BI " unsigned " mode ", char *" ivec ); +.BI "int cbc_crypt(char *" key ", char *" data ", unsigned int " datalen , +.BI " unsigned int " mode ", char *" ivec ); .PP .BI "void des_setparity(char *" key ); .PP
man3/getrpcport.3 +1 -1
@@ -13,7 +13,7 @@ getrpcport \- get RPC port number .B "#include <rpc/rpc.h>" .PP .BI "int getrpcport(const char *" host ", unsigned long " prognum , -.BI " unsigned long " versnum ", unsigned " proto ); +.BI " unsigned long " versnum ", unsigned int " proto ); .fi .SH DESCRIPTION .BR getrpcport ()
man3/random.3 +2 -2
@@ -39,9 +39,9 @@ random, srandom, initstate, setstate \- random number generator .PP .B long random(void); .PP -.BI "void srandom(unsigned " seed ); +.BI "void srandom(unsigned int " seed ); .PP -.BI "char *initstate(unsigned " seed ", char *" state ", size_t " n ); +.BI "char *initstate(unsigned int " seed ", char *" state ", size_t " n ); .PP .BI "char *setstate(char *" state ); .fi
man3/xdr.3 +1 -1
@@ -433,7 +433,7 @@ C characters and their external representations. This routine returns one if it succeeds, zero otherwise. .PP .nf -.BI "bool_t xdr_u_int(XDR *" xdrs ", unsigned *" up ); +.BI "bool_t xdr_u_int(XDR *" xdrs ", unsigned int *" up ); .fi .IP A filter primitive that translates between C
Signature · 1 line
2.29.2
Hi Alex,
Quoted 5 lines · Alejandro Colomar
$ find man? -type f \
|xargs sed -i \
-e 's/unsigned \*/unsigned int */g'
-e 's/unsigned "/unsigned int "/g';The patch is fine in my opinion, but the commit message needs work. Something like:
1. Most pages use 'unsigned int'; make them all do so.
2. Explicit 'unsigned int' is clearer than 'unsigned'.
Thanks,
Michael
Quoted 132 lines
Signed-off-by Alejandro Colomar <[email protected]>--- man2/getcpu.2 | 4 ++-- man2/io_setup.2 | 2 +- man2/mbind.2 | 2 +- man3/cfree.3 | 2 +- man3/des_crypt.3 | 8 ++++---- man3/getrpcport.3 | 2 +- man3/random.3 | 4 ++-- man3/xdr.3 | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-)man2/getcpu.2 +2
-2@@ -16,8 +16,8 @@ getcpu \- determine CPU and NUMA node on which the calling thread is running .nf .B #include <linux/getcpu.h> .PP -.BI "int getcpu(unsigned *" cpu ", unsigned *" node \ -", struct getcpu_cache *" tcache ); +.BI "int getcpu(unsigned int *" cpu ", unsigned int *" node , +.BI " struct getcpu_cache *" tcache ); .fi .SH DESCRIPTION Theman2/io_setup.2 +1
-1@@ -11,7 +11,7 @@ io_setup \- create an asynchronous I/O context .nf .BR "#include <linux/aio_abi.h>" " /* Defines needed types */" .PP -.BI "long io_setup(unsigned " nr_events ", aio_context_t *" ctx_idp ); +.BI "long io_setup(unsigned int " nr_events ", aio_context_t *" ctx_idp ); .fi .PP .IR Note :man2/mbind.2 +1
-1@@ -41,7 +41,7 @@ mbind \- set memory policy for a memory range .PP .BI "long mbind(void *" addr ", unsigned long " len ", int " mode , .BI " const unsigned long *" nodemask ", unsigned long " maxnode , -.BI " unsigned " flags ); +.BI " unsigned int " flags ); .PP Link with \fI\-lnuma\fP. .fiman3/cfree.3 +1
-1@@ -36,7 +36,7 @@ cfree \- free allocated memory .BI "void cfree(void *" ptr ); .PP /* In SCO OpenServer */ -.BI "void cfree(char *" ptr ", unsigned " num ", unsigned " size ); +.BI "void cfree(char *" ptr ", unsigned int " num ", unsigned int " size ); .PP /* In Solaris watchmalloc.so.1 */ .BI "void cfree(void *" ptr ", size_t " nelem ", size_t " elsize );man3/des_crypt.3 +4
-4@@ -21,11 +21,11 @@ DES encryption .\" .B #include <des_crypt.h> .B #include <rpc/des_crypt.h> .PP -.BI "int ecb_crypt(char *" key ", char *" data ", unsigned " datalen , -.BI " unsigned " mode ); +.BI "int ecb_crypt(char *" key ", char *" data ", unsigned int " datalen , +.BI " unsigned int " mode ); .PP -.BI "int cbc_crypt(char *" key ", char *" data ", unsigned " datalen , -.BI " unsigned " mode ", char *" ivec ); +.BI "int cbc_crypt(char *" key ", char *" data ", unsigned int " datalen , +.BI " unsigned int " mode ", char *" ivec ); .PP .BI "void des_setparity(char *" key ); .PPman3/getrpcport.3 +1
-1@@ -13,7 +13,7 @@ getrpcport \- get RPC port number .B "#include <rpc/rpc.h>" .PP .BI "int getrpcport(const char *" host ", unsigned long " prognum , -.BI " unsigned long " versnum ", unsigned " proto ); +.BI " unsigned long " versnum ", unsigned int " proto ); .fi .SH DESCRIPTION .BR getrpcport ()man3/random.3 +2
-2@@ -39,9 +39,9 @@ random, srandom, initstate, setstate \- random number generator .PP .B long random(void); .PP -.BI "void srandom(unsigned " seed ); +.BI "void srandom(unsigned int " seed ); .PP -.BI "char *initstate(unsigned " seed ", char *" state ", size_t " n ); +.BI "char *initstate(unsigned int " seed ", char *" state ", size_t " n ); .PP .BI "char *setstate(char *" state ); .fiman3/xdr.3 +1
-2@@ -433,7 +433,7 @@ C characters and their external representations. This routine returns one if it succeeds, zero otherwise. .PP .nf -.BI "bool_t xdr_u_int(XDR *" xdrs ", unsigned *" up ); +.BI "bool_t xdr_u_int(XDR *" xdrs ", unsigned int *" up ); .fi .IP A filter primitive that translates between C --2.29.2
Signature · 3 lines
Michael Kerrisk Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/ Linux/UNIX System Programming Training: http://man7.org/training/
Quoted 9 lines · Michael Kerrisk (man-pages)
Hi Alex,
Quoted 5 lines · Alejandro Colomar
$ find man? -type f \ |xargs sed -i \ -e 's/unsigned \*/unsigned int */g' -e 's/unsigned "/unsigned int "/g';
Quoted 6 lines
The patch is fine in my opinion, but the commit message needs work. Something like:
1. Most pages use 'unsigned int'; make them all do so.
2. Explicit 'unsigned int' is clearer than 'unsigned'.
Agree.
I wasn't convinced by my commit msg,
but didn't come up with a good one (:
I'll fix it tomorrow.
Cheers,
Alex
Quoted 138 lines
Thanks,
Michael
Quoted 132 lines
Signed-off-by Alejandro Colomar <[email protected]>--- man2/getcpu.2 | 4 ++-- man2/io_setup.2 | 2 +- man2/mbind.2 | 2 +- man3/cfree.3 | 2 +- man3/des_crypt.3 | 8 ++++---- man3/getrpcport.3 | 2 +- man3/random.3 | 4 ++-- man3/xdr.3 | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-)man2/getcpu.2 +2
-2@@ -16,8 +16,8 @@ getcpu \- determine CPU and NUMA node on which the calling thread is running .nf .B #include <linux/getcpu.h> .PP -.BI "int getcpu(unsigned *" cpu ", unsigned *" node \ -", struct getcpu_cache *" tcache ); +.BI "int getcpu(unsigned int *" cpu ", unsigned int *" node , +.BI " struct getcpu_cache *" tcache ); .fi .SH DESCRIPTION Theman2/io_setup.2 +1
-1@@ -11,7 +11,7 @@ io_setup \- create an asynchronous I/O context .nf .BR "#include <linux/aio_abi.h>" " /* Defines needed types */" .PP -.BI "long io_setup(unsigned " nr_events ", aio_context_t *" ctx_idp ); +.BI "long io_setup(unsigned int " nr_events ", aio_context_t *" ctx_idp ); .fi .PP .IR Note :man2/mbind.2 +1
-1@@ -41,7 +41,7 @@ mbind \- set memory policy for a memory range .PP .BI "long mbind(void *" addr ", unsigned long " len ", int " mode , .BI " const unsigned long *" nodemask ", unsigned long " maxnode , -.BI " unsigned " flags ); +.BI " unsigned int " flags ); .PP Link with \fI\-lnuma\fP. .fiman3/cfree.3 +1
-1@@ -36,7 +36,7 @@ cfree \- free allocated memory .BI "void cfree(void *" ptr ); .PP /* In SCO OpenServer */ -.BI "void cfree(char *" ptr ", unsigned " num ", unsigned " size ); +.BI "void cfree(char *" ptr ", unsigned int " num ", unsigned int " size ); .PP /* In Solaris watchmalloc.so.1 */ .BI "void cfree(void *" ptr ", size_t " nelem ", size_t " elsize );man3/des_crypt.3 +4
-4@@ -21,11 +21,11 @@ DES encryption .\" .B #include <des_crypt.h> .B #include <rpc/des_crypt.h> .PP -.BI "int ecb_crypt(char *" key ", char *" data ", unsigned " datalen , -.BI " unsigned " mode ); +.BI "int ecb_crypt(char *" key ", char *" data ", unsigned int " datalen , +.BI " unsigned int " mode ); .PP -.BI "int cbc_crypt(char *" key ", char *" data ", unsigned " datalen , -.BI " unsigned " mode ", char *" ivec ); +.BI "int cbc_crypt(char *" key ", char *" data ", unsigned int " datalen , +.BI " unsigned int " mode ", char *" ivec ); .PP .BI "void des_setparity(char *" key ); .PPman3/getrpcport.3 +1
-1@@ -13,7 +13,7 @@ getrpcport \- get RPC port number .B "#include <rpc/rpc.h>" .PP .BI "int getrpcport(const char *" host ", unsigned long " prognum , -.BI " unsigned long " versnum ", unsigned " proto ); +.BI " unsigned long " versnum ", unsigned int " proto ); .fi .SH DESCRIPTION .BR getrpcport ()man3/random.3 +2
-2@@ -39,9 +39,9 @@ random, srandom, initstate, setstate \- random number generator .PP .B long random(void); .PP -.BI "void srandom(unsigned " seed ); +.BI "void srandom(unsigned int " seed ); .PP -.BI "char *initstate(unsigned " seed ", char *" state ", size_t " n ); +.BI "char *initstate(unsigned int " seed ", char *" state ", size_t " n ); .PP .BI "char *setstate(char *" state ); .fiman3/xdr.3 +1
-2@@ -433,7 +433,7 @@ C characters and their external representations. This routine returns one if it succeeds, zero otherwise. .PP .nf -.BI "bool_t xdr_u_int(XDR *" xdrs ", unsigned *" up ); +.BI "bool_t xdr_u_int(XDR *" xdrs ", unsigned int *" up ); .fi .IP A filter primitive that translates between C --2.29.2