[KJ] [PATCH] net/sunrpc string * to [] fix

[KJ] [PATCH] net/sunrpc string * to [] fix

[Ricardo Nabinger Sanchez]

[-- Attachment #1.1.1: Type: text/plain, Size: 891 bytes --]

Hello,

I'm new here, and would like to help with Kernel-Janitors.  If nobody else
is working on 'char *s = "string";', I'd like to continue fixing the
remaining strings (473 to go).


This patch "fixes" net/sunrpc/sched.c and svcauth_unix.c string
declarations from 
	char *p = "string"
to
	char p[] = "string";
as pointed by Jeff Garzik on Kernel-Janitors' TODO.


Apologies for attaching the patch (and not inlining it), but it would be
mangled otherwise.  I'll try to fix this.

Best regards.

---

 sched.c        |    2 +-
 svcauth_unix.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Signed-off-by: Ricardo Nabinger Sanchez <rnsanchez@terra.com.br>

-- 
Ricardo Nabinger Sanchez
GNU/Linux #140696 [http://counter.li.org]
Slackware Linux + FreeBSD

    How long a minute is depends on which 
    side of the bathroom door you're on.


[-- Attachment #1.1.2: sunrpc_string_fix.patch --]
[-- Type: text/plain, Size: 1122 bytes --]

diff -urNp -X dontdiff linux-2.6.11.10/net/sunrpc/sched.c mod-linux-2.6.11.10/net/sunrpc/sched.c
--- linux-2.6.11.10/net/sunrpc/sched.c	2005-05-25 17:52:45.000000000 -0300
+++ mod-linux-2.6.11.10/net/sunrpc/sched.c	2005-05-25 17:54:39.000000000 -0300
@@ -1054,7 +1054,7 @@ void rpc_show_tasks(void)
 	printk("-pid- proc flgs status -client- -prog- --rqstp- -timeout "
 		"-rpcwait -action- --exit--\n");
 	alltask_for_each(t, le, &all_tasks) {
-		const char *rpc_waitq = "none";
+		const char rpc_waitq[] = "none";
 
 		if (RPC_IS_QUEUED(t))
 			rpc_waitq = rpc_qname(t->u.tk_wait.rpc_waitq);
diff -urNp -X dontdiff linux-2.6.11.10/net/sunrpc/svcauth_unix.c mod-linux-2.6.11.10/net/sunrpc/svcauth_unix.c
--- linux-2.6.11.10/net/sunrpc/svcauth_unix.c	2005-05-25 17:52:57.000000000 -0300
+++ mod-linux-2.6.11.10/net/sunrpc/svcauth_unix.c	2005-05-25 17:54:54.000000000 -0300
@@ -222,7 +222,7 @@ static int ip_map_show(struct seq_file *
 {
 	struct ip_map *im;
 	struct in_addr addr;
-	char *dom = "-no-domain-";
+	char dom[] = "-no-domain-";
 
 	if (h == NULL) {
 		seq_puts(m, "#class IP domain\n");

[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] net/sunrpc string * to [] fix

[Domen Puncer]

[-- Attachment #1: Type: text/plain, Size: 1765 bytes --]

> Content-Transfer-Encoding: quoted-printable

Please set to plain text (disk.c patch is ok in this regard).


On 25/05/05 18:33 -0300, Ricardo Nabinger Sanchez wrote:
> Hello,
> 
> I'm new here, and would like to help with Kernel-Janitors.  If nobody else
> is working on 'char *s = "string";', I'd like to continue fixing the
> remaining strings (473 to go).
> 
> 
> This patch "fixes" net/sunrpc/sched.c and svcauth_unix.c string
> declarations from 
> 	char *p = "string"
> to
> 	char p[] = "string";
> as pointed by Jeff Garzik on Kernel-Janitors' TODO.
> 
> 
> Apologies for attaching the patch (and not inlining it), but it would be
> mangled otherwise.  I'll try to fix this.
> 
> Best regards.
> 
> ---
> 
>  sched.c        |    2 +-
>  svcauth_unix.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> Signed-off-by: Ricardo Nabinger Sanchez <rnsanchez@terra.com.br>

Put this line before "---", as everything after it is discarded.

> diff -urNp -X dontdiff linux-2.6.11.10/net/sunrpc/sched.c mod-linux-2.6.11.10/net/sunrpc/sched.c
> --- linux-2.6.11.10/net/sunrpc/sched.c	2005-05-25 17:52:45.000000000 -0300
> +++ mod-linux-2.6.11.10/net/sunrpc/sched.c	2005-05-25 17:54:39.000000000 -0300
> @@ -1054,7 +1054,7 @@ void rpc_show_tasks(void)
>  	printk("-pid- proc flgs status -client- -prog- --rqstp- -timeout "
>  		"-rpcwait -action- --exit--\n");
>  	alltask_for_each(t, le, &all_tasks) {
> -		const char *rpc_waitq = "none";
> +		const char rpc_waitq[] = "none";
>  
>  		if (RPC_IS_QUEUED(t))
>  			rpc_waitq = rpc_qname(t->u.tk_wait.rpc_waitq);

			^^^ this won't work now. Compile test should
				catch this.


Care to resend disk.c patch, as it's missing Signed-off-by (and
this seems to be the only thing wrong with it).


	Domen

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] net/sunrpc string * to [] fix

[Ricardo Nabinger Sanchez]

[-- Attachment #1: Type: text/plain, Size: 661 bytes --]

Quoting  Domen Puncer <domen@coderock.org>
Sent on  Thu, 26 May 2005 08:15:42 +0200

> Care to resend disk.c patch, as it's missing Signed-off-by (and
> this seems to be the only thing wrong with it).

After taking a new look over the code, I noticed that this patch would
break stuff.  As the string is modified afterwards (with an assignment), it
would compile fail.  I surely overlooked it.  Sorry :)

So, my very first patch is broken :)
Please disregard (and/or drop) it.

-- 
Ricardo Nabinger Sanchez
GNU/Linux #140696 [http://counter.li.org]
Slackware Linux + FreeBSD

    How long a minute is depends on which 
    side of the bathroom door you're on.


[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors