Index: uspace/app/bdsh/cmds/builtins/batch/batch.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision 27381e33f97760f3a8c85467d4d1a17ac141fe3a)
+++ uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -85,5 +85,5 @@
 	}
 
-	int rc = 0;
+	int rc = EOK;
 	FILE *batch = fopen(argv[1], "r");
 	if (batch == NULL) {
@@ -104,5 +104,5 @@
 				if (cur == fusr.line) {
 					/* skip empty line */
-					rc = 0;
+					rc = EOK;
 					free(cur);
 				} else {
Index: uspace/app/bdsh/cmds/builtins/cd/cd.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 27381e33f97760f3a8c85467d4d1a17ac141fe3a)
+++ uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -85,5 +85,6 @@
 int cmd_cd(char **argv, cliuser_t *usr)
 {
-	int argc, rc = 0;
+	int argc;
+	int rc = EOK;
 
 	argc = cli_count_args(argv);
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 27381e33f97760f3a8c85467d4d1a17ac141fe3a)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -94,10 +94,11 @@
 
 	int ret = 0;
+	int rc;
 
 	if (!create_parents) {
-		ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-		if (ret != EOK) {
+		rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+		if (rc != EOK) {
 			cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-			    cmdname, path, str_error(ret));
+			    cmdname, path, str_error(rc));
 			ret = 1;
 		}
@@ -135,8 +136,8 @@
 			path[prev_off] = 0;
 
-			ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-			if (ret != EOK && ret != EEXIST) {
+			rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+			if (rc != EOK && rc != EEXIST) {
 				cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-				    cmdname, path, str_error(ret));
+				    cmdname, path, str_error(rc));
 				ret = 1;
 				goto leave;
@@ -146,8 +147,8 @@
 		}
 		/* Create the final directory. */
-		ret = vfs_link_path(path, KIND_DIRECTORY, NULL);
-		if (ret != EOK) {
+		rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+		if (rc != EOK) {
 			cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-			    cmdname, path, str_error(ret));
+			    cmdname, path, str_error(rc));
 			ret = 1;
 		}
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 27381e33f97760f3a8c85467d4d1a17ac141fe3a)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -202,5 +202,5 @@
 	free(buffer);
 
-	if (vfs_put(fd) < 0)
+	if (vfs_put(fd) != EOK)
 		goto error;
 
Index: uspace/app/bdsh/cmds/modules/mount/mount.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mount/mount.c	(revision 27381e33f97760f3a8c85467d4d1a17ac141fe3a)
+++ uspace/app/bdsh/cmds/modules/mount/mount.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -132,5 +132,6 @@
 	const char *mopts = "";
 	const char *dev = "";
-	int rc, c, opt_ind;
+	int rc;
+	int c, opt_ind;
 	unsigned int instance = 0;
 	bool instance_set = false;
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 27381e33f97760f3a8c85467d4d1a17ac141fe3a)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -209,5 +209,5 @@
 	rc = vfs_unlink_path(path);
 	if (rc == EOK)
-		return EOK;
+		return 0;
 
 	cli_error(CL_ENOTSUP, "Can not remove %s", path);
Index: uspace/app/bdsh/exec.c
===================================================================
--- uspace/app/bdsh/exec.c	(revision 27381e33f97760f3a8c85467d4d1a17ac141fe3a)
+++ uspace/app/bdsh/exec.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -98,5 +98,6 @@
 	task_exit_t texit;
 	char *tmp;
-	int rc, retval, i;
+	int rc;
+	int retval, i;
 	int file_handles[3] = { -1, -1, -1 };
 	FILE *files[3];
Index: uspace/app/bdsh/test/toktest.c
===================================================================
--- uspace/app/bdsh/test/toktest.c	(revision 27381e33f97760f3a8c85467d4d1a17ac141fe3a)
+++ uspace/app/bdsh/test/toktest.c	(revision d5c1051faf4391647834d99babdd4a44ee5d9700)
@@ -47,9 +47,9 @@
 
 	int rc = tok_init(&tokenizer, input_buffer, tokens, MAX_TOKENS);
-	PCUT_ASSERT_INT_EQUALS(EOK, rc);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
 	size_t token_count;
 	rc = tok_tokenize(&tokenizer, &token_count);
-	PCUT_ASSERT_INT_EQUALS(EOK, rc);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);