cleanup the coding style
Signed-off-by: Peng Haitao <[email protected]>
---
.../kernel/containers/sysvipc/shmem_2nstest.c | 81 +++++++++----------
1 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/testcases/kernel/containers/sysvipc/shmem_2nstest.c
b/testcases/kernel/containers/sysvipc/shmem_2nstest.c
index 6033991..8b5534c 100644
--- a/testcases/kernel/containers/sysvipc/shmem_2nstest.c
+++ b/testcases/kernel/containers/sysvipc/shmem_2nstest.c
@@ -64,13 +64,12 @@ int check_shmem1(void *vtest)
int id1;
close(p1[0]);
- /* first create the key */
- id1 = shmget(TESTKEY, 100, IPC_CREAT);
- if (id1 == -1) {
- perror("shmget");
- tst_resm(TFAIL, "shmget failed\n");
- tst_exit();
- }
+ /* first create the key */
+ id1 = shmget(TESTKEY, 100, IPC_CREAT);
+ if (id1 == -1) {
+ perror("shmget");
+ tst_brkm(TFAIL, NULL, "shmget failed\n");
+ }
tst_resm(TINFO, "Cont1: Able to create shared mem segment");
write(p1[1], "done", 5);
@@ -83,29 +82,28 @@ int check_shmem1(void *vtest)
*/
int check_shmem2(void *vtest)
{
- char buf[3];
- int id2;
- close(p1[1]);
- close(p2[0]);
-
- read(p1[0], buf, 3);
- /* Trying to access shmem, if not existing create new shmem */
- id2 = shmget(TESTKEY, 100, 0);
+ char buf[3];
+ int id2;
+ close(p1[1]);
+ close(p2[0]);
+
+ read(p1[0], buf, 3);
+ /* Trying to access shmem, if not existing create new shmem */
+ id2 = shmget(TESTKEY, 100, 0);
+ if (id2 == -1) {
+ id2 = shmget(TESTKEY, 100, IPC_CREAT);
if (id2 == -1) {
- id2 = shmget(TESTKEY, 100, IPC_CREAT);
- if (id2 == -1) {
- perror("shmget");
- tst_resm(TFAIL, "shmget failed\n");
- } else
- tst_resm(TINFO, "Cont2: Able to allocate shmem
seg with "
- "the same key");
- write(p2[1], "notfnd", 7);
-
+ perror("shmget");
+ tst_resm(TFAIL, "shmget failed\n");
} else
- write(p2[1], "exists", 7);
+ tst_resm(TINFO, "Cont2: Able to allocate shmem seg with
"
+ "the same key");
+ write(p2[1], "notfnd", 7);
+ } else
+ write(p2[1], "exists", 7);
- tst_exit();
- return 0;
+ tst_exit();
+ return 0;
}
int main(int argc, char *argv[])
@@ -123,8 +121,10 @@ int main(int argc, char *argv[])
}
/* Using PIPE's to sync between containers and Parent */
- if (pipe(p1) == -1) { tst_resm(TBROK, "pipe1 error"); tst_exit(); }
- if (pipe(p2) == -1) { tst_resm(TBROK, "pipe2 error"); tst_exit(); }
+ if (pipe(p1) == -1)
+ tst_brkm(TBROK, NULL, "pipe1 error");
+ if (pipe(p2) == -1)
+ tst_brkm(TBROK, NULL, "pipe2 error");
if (strcmp(argv[1], "clone") == 0) {
use_clone = T_CLONE;
@@ -138,39 +138,34 @@ int main(int argc, char *argv[])
/* Create 2 containers */
ret = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmem1,
NULL);
- if (ret < 0) {
- tst_resm(TFAIL, "clone/unshare failed\n");
- tst_exit();
- }
+ if (ret < 0)
+ tst_brkm(TFAIL, NULL, "clone/unshare failed\n");
ret = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmem2,
NULL);
- if (ret < 0) {
- tst_resm(TFAIL, "clone/unshare failed\n");
- tst_exit();
- }
- close(p2[1]);
+ if (ret < 0)
+ tst_brkm(TFAIL, NULL, "clone/unshare failed\n");
+ close(p2[1]);
read(p2[0], buf, 7);
if (strcmp(buf, "exists") == 0) {
if (use_clone == T_NONE)
tst_resm(TPASS, "Plain cloned process able to access
shmem "
- "segment created\n");
+ "segment created\n");
else
tst_resm(TFAIL, "%s : In namespace2 found the shmem
segment "
- "created in
Namespace1\n", tsttype);
+ "created in Namespace1\n", tsttype);
} else {
if (use_clone == T_NONE)
tst_resm(TFAIL, "Plain cloned process didn't find shmem
seg\n");
else
tst_resm(TPASS, "%s : In namespace2 unable to access
the shmem seg "
- "created in
Namespace1\n", tsttype);
+ "created in Namespace1\n", tsttype);
}
/* destroy the key */
id = shmget(TESTKEY, 100, 0);
shmctl(id, IPC_RMID, NULL);
- tst_exit();
tst_exit();
-}
\ No newline at end of file
+}
--
1.7.1
--
Best Regards,
Peng
cleanup the coding style
Signed-off-by: Peng Haitao <[email protected]>
---
.../kernel/containers/sysvipc/shmem_2nstest.c | 81 +++++++++----------
1 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/testcases/kernel/containers/sysvipc/shmem_2nstest.c
b/testcases/kernel/containers/sysvipc/shmem_2nstest.c
index 6033991..8b5534c 100644
--- a/testcases/kernel/containers/sysvipc/shmem_2nstest.c
+++ b/testcases/kernel/containers/sysvipc/shmem_2nstest.c
@@ -64,13 +64,12 @@ int check_shmem1(void *vtest)
int id1;
close(p1[0]);
- /* first create the key */
- id1 = shmget(TESTKEY, 100, IPC_CREAT);
- if (id1 == -1) {
- perror("shmget");
- tst_resm(TFAIL, "shmget failed\n");
- tst_exit();
- }
+ /* first create the key */
+ id1 = shmget(TESTKEY, 100, IPC_CREAT);
+ if (id1 == -1) {
+ perror("shmget");
+ tst_brkm(TFAIL, NULL, "shmget failed\n");
+ }
tst_resm(TINFO, "Cont1: Able to create shared mem segment");
write(p1[1], "done", 5);
@@ -83,29 +82,28 @@ int check_shmem1(void *vtest)
*/
int check_shmem2(void *vtest)
{
- char buf[3];
- int id2;
- close(p1[1]);
- close(p2[0]);
-
- read(p1[0], buf, 3);
- /* Trying to access shmem, if not existing create new shmem */
- id2 = shmget(TESTKEY, 100, 0);
+ char buf[3];
+ int id2;
+ close(p1[1]);
+ close(p2[0]);
+
+ read(p1[0], buf, 3);
+ /* Trying to access shmem, if not existing create new shmem */
+ id2 = shmget(TESTKEY, 100, 0);
+ if (id2 == -1) {
+ id2 = shmget(TESTKEY, 100, IPC_CREAT);
if (id2 == -1) {
- id2 = shmget(TESTKEY, 100, IPC_CREAT);
- if (id2 == -1) {
- perror("shmget");
- tst_resm(TFAIL, "shmget failed\n");
- } else
- tst_resm(TINFO, "Cont2: Able to allocate shmem
seg with "
- "the same key");
- write(p2[1], "notfnd", 7);
-
+ perror("shmget");
+ tst_resm(TFAIL, "shmget failed\n");
} else
- write(p2[1], "exists", 7);
+ tst_resm(TINFO, "Cont2: Able to allocate shmem seg with
"
+ "the same key");
+ write(p2[1], "notfnd", 7);
+ } else
+ write(p2[1], "exists", 7);
- tst_exit();
- return 0;
+ tst_exit();
+ return 0;
}
int main(int argc, char *argv[])
@@ -123,8 +121,10 @@ int main(int argc, char *argv[])
}
/* Using PIPE's to sync between containers and Parent */
- if (pipe(p1) == -1) { tst_resm(TBROK, "pipe1 error"); tst_exit(); }
- if (pipe(p2) == -1) { tst_resm(TBROK, "pipe2 error"); tst_exit(); }
+ if (pipe(p1) == -1)
+ tst_brkm(TBROK, NULL, "pipe1 error");
+ if (pipe(p2) == -1)
+ tst_brkm(TBROK, NULL, "pipe2 error");
if (strcmp(argv[1], "clone") == 0) {
use_clone = T_CLONE;
@@ -138,39 +138,34 @@ int main(int argc, char *argv[])
/* Create 2 containers */
ret = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmem1,
NULL);
- if (ret < 0) {
- tst_resm(TFAIL, "clone/unshare failed\n");
- tst_exit();
- }
+ if (ret < 0)
+ tst_brkm(TFAIL, NULL, "clone/unshare failed\n");
ret = do_clone_unshare_test(use_clone, CLONE_NEWIPC, check_shmem2,
NULL);
- if (ret < 0) {
- tst_resm(TFAIL, "clone/unshare failed\n");
- tst_exit();
- }
- close(p2[1]);
+ if (ret < 0)
+ tst_brkm(TFAIL, NULL, "clone/unshare failed\n");
+ close(p2[1]);
read(p2[0], buf, 7);
if (strcmp(buf, "exists") == 0) {
if (use_clone == T_NONE)
tst_resm(TPASS, "Plain cloned process able to access
shmem "
- "segment created\n");
+ "segment created\n");
else
tst_resm(TFAIL, "%s : In namespace2 found the shmem
segment "
- "created in
Namespace1\n", tsttype);
+ "created in Namespace1\n", tsttype);
} else {
if (use_clone == T_NONE)
tst_resm(TFAIL, "Plain cloned process didn't find shmem
seg\n");
else
tst_resm(TPASS, "%s : In namespace2 unable to access
the shmem seg "
- "created in
Namespace1\n", tsttype);
+ "created in Namespace1\n", tsttype);
}
/* destroy the key */
id = shmget(TESTKEY, 100, 0);
shmctl(id, IPC_RMID, NULL);
- tst_exit();
tst_exit();
-}
\ No newline at end of file
+}
--
1.7.1
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
