From 0709d365a11d65b938e03ed5e4825b7560b2569d Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Thu, 15 Sep 2011 21:49:56 +0200 Subject: [PATCH] remove some compiler warnings --- fs/initrd.c | 2 +- kernel/tasks.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/initrd.c b/fs/initrd.c index 09719171..33d1eceb 100644 --- a/fs/initrd.c +++ b/fs/initrd.c @@ -212,7 +212,7 @@ static int initrd_open(fildes_t* file, const char* name) } if (file->node->type == FS_DIRECTORY) { - if (!file->flags & O_CREAT) + if (!(file->flags & O_CREAT)) return -ENOENT; uint32_t i, j; diff --git a/kernel/tasks.c b/kernel/tasks.c index 53186cbe..60c8e412 100644 --- a/kernel/tasks.c +++ b/kernel/tasks.c @@ -507,13 +507,12 @@ static int load_task(load_args_t* largs) elf_header_t header; elf_program_header_t prog_header; //elf_section_header_t sec_header; - ///!!! kfree is missing! + ///!!! kfree is missing! fildes_t *file = kmalloc(sizeof(fildes_t)); file->offset = 0; file->flags = 0; //TODO: init the hole fildes_t struct! - vfs_node_t* node; task_t* curr_task = per_core(current_task); int err; @@ -524,7 +523,7 @@ static int load_task(load_args_t* largs) if (!file->node) return -EINVAL; - read_fs(file, (uint8_t*)&header, sizeof(elf_header_t)); + err = read_fs(file, (uint8_t*)&header, sizeof(elf_header_t)); if (err < 0) { kprintf("read_fs failed: %d\n", err); return err;