Skip to contentSkip to conversation

ipc/msg.c: Adjust indentation in ksys_msgctl

PATCH In review Nathan Chancellor 2 participants 2 messages Dec 18, 2019 – Dec 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipc/msg.c: Adjust indentation in ksys_msgctl

Clang warns:

../ipc/msg.c:621:4: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm,

msqid64.msg_qbytes);
                 ^

../ipc/msg.c:619:3: note: previous statement is here
if (copy_msqid_from_user(&msqid64, buf, version)) ^
1 warning generated.

This warning occurs because there is a space after the tab on this line. Remove it so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.

---

I assume this will be squashed into the offending patch since it is still in -next:

https://git.kernel.org/next/linux-next/c/658622e448a6e6a6a69471daeff7e95e98d34ed1

 ipc/msg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
ipc/msg.c +2 -1
index 22ed09ded601..caca67368cb5 100644
@@ -618,7 +618,8 @@ static long ksys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf, int ver
 	case IPC_SET:
 		if (copy_msqid_from_user(&msqid64, buf, version))
 			return -EFAULT;
-		 return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm, msqid64.msg_qbytes);
+		return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm,
+				   msqid64.msg_qbytes);
 	case IPC_RMID:
 		return msgctl_down(ns, msqid, cmd, NULL, 0);
 	default:
Signature · 1 line
2.24.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Nathan Chancellor

Clang warns:

../ipc/msg.c:621:4: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm,

msqid64.msg_qbytes);
                 ^

../ipc/msg.c:619:3: note: previous statement is here
if (copy_msqid_from_user(&msqid64, buf, version)) ^
1 warning generated.

Quoted 6 lines

This warning occurs because there is a space after the tab on this line. Remove it so that the indentation is consistent with the Linux kernel coding style and clang no longer warns.

Thanks for the patch!

Quoted 31 lines

---

I assume this will be squashed into the offending patch since it is still in -next:

https://git.kernel.org/next/linux-next/c/658622e448a6e6a6a69471daeff7e95e98d34ed1

 ipc/msg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
ipc/msg.c +2 -2
index 22ed09ded601..caca67368cb5 100644
@@ -618,7 +618,8 @@ static long ksys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf, int ver
        case IPC_SET:
                if (copy_msqid_from_user(&msqid64, buf, version))
                        return -EFAULT;
-                return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm, msqid64.msg_qbytes);
+               return msgctl_down(ns, msqid, cmd, &msqid64.msg_perm,
+                                  msqid64.msg_qbytes);
        case IPC_RMID:
                return msgctl_down(ns, msqid, cmd, NULL, 0);
        default:
--

2.24.1

--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20191218032932.37479-1-natechancellor%40gmail.com.

Signature · 2 lines
Thanks,
~Nick Desaulniers