[syscall] readv & writev clean-up - MR #207

Signed-off-by: Jean-Pierre Miceli <jean-pierre.miceli@heig-vd.ch>

Author: jmi-reds

so3/fs/vfs.c

@@ -422,8 +422,6 @@ static int do_read(int fd, void *buffer, int count)
 	return ret;
 }
 
-
-
 /* Low Level write */
 static int do_write(int fd, const void *buffer, int count)
 {
@@ -844,12 +842,11 @@ SYSCALL_DEFINE3(fcntl, int, fd, unsigned long, cmd, unsigned long, args)
 SYSCALL_DEFINE3(writev, unsigned long, fd, const struct iovec *, vec, unsigned long, vlen)
 {
 	int i;
-	int ret;
+	int ret = 0;
 	int total = 0;
 
 	for (i = 0; i < vlen; i++) {
-		ret = do_write(fd, (const void *)vec[i].iov_base, vec[i].iov_len);
-		ret = do_read(fd, vec[i].iov_base, vec[i].iov_len);
+		ret = do_write(fd, (const void *) vec[i].iov_base, vec[i].iov_len);
 		if (ret < 0) {
 			break;
 		} else if ((ret >= 0) && (ret < vec[i].iov_len)) {
@@ -866,11 +863,10 @@ SYSCALL_DEFINE3(writev, unsigned long, fd, const struct iovec *, vec, unsigned l
 		return total;
 }
 
-SYSCALL_DEFINE3(readv, unsigned long, fd, const struct iovec *, vec,
-		unsigned long, vlen)
+SYSCALL_DEFINE3(readv, unsigned long, fd, const struct iovec *, vec, unsigned long, vlen)
 {
 	int i;
-	int ret;
+	int ret = 0;
 	int total = 0;
 
 	for (i = 0; i < vlen; i++) {

so3/include/syscall.h

@@ -95,7 +95,7 @@
 #define SYSCALL_DEFINE0(name)                     \
 	long __sys_##name(syscall_args_t *unused) \
 	{                                         \
-		return sys_do_##name();               \
+		return sys_do_##name();           \
 	}                                         \
 	inline long sys_do_##name(void)
 #define SYSCALL_DEFINE1(...) __SYSCALL_DEFINEx(1, __VA_ARGS__)
@@ -105,11 +105,11 @@
 #define SYSCALL_DEFINE5(...) __SYSCALL_DEFINEx(5, __VA_ARGS__)
 #define SYSCALL_DEFINE6(...) __SYSCALL_DEFINEx(6, __VA_ARGS__)
 
-#define __SYSCALL_DEFINEx(x, name, ...)                                   \
-	long __sys_##name(syscall_args_t *args)                           \
-	{                                                                 \
+#define __SYSCALL_DEFINEx(x, name, ...)                                       \
+	long __sys_##name(syscall_args_t *args)                               \
+	{                                                                     \
 		return sys_do_##name(__MAP_ARGS(x, args->args, __VA_ARGS__)); \
-	}                                                                 \
+	}                                                                     \
 	inline long sys_do_##name(__MAP(x, __M_DECL, __VA_ARGS__))
 
 typedef struct {

so3/include/vfs.h

@@ -110,7 +110,6 @@ struct iovec {
 
 #define iovec iovec
 
-
 struct file_operations {
 	int (*open)(int fd, const char *path);
 	int (*close)(int fd);