From 7221a5885476772d782db547b14504418dcfbb9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 17 Oct 2003 14:05:05 +0000 Subject: [PATCH] Fixed some warnings. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5073 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/core/fs/devfs.c | 21 +++------------------ src/kernel/core/fs/pipefs.cpp | 6 +++++- src/kernel/core/fs/rootfs.c | 2 ++ 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/kernel/core/fs/devfs.c b/src/kernel/core/fs/devfs.c index bea1160dbf..8d09857591 100755 --- a/src/kernel/core/fs/devfs.c +++ b/src/kernel/core/fs/devfs.c @@ -179,6 +179,7 @@ devfs_delete_vnode(struct devfs *fs, struct devfs_vnode *v, bool force_delete) } +#if 0 static void insert_cookie_in_jar(struct devfs_vnode *dir, struct devfs_cookie *cookie) { @@ -200,6 +201,7 @@ remove_cookie_from_jar(struct devfs_vnode *dir, struct devfs_cookie *cookie) cookie->u.dir.prev = cookie->u.dir.next = NULL; } +#endif /* makes sure none of the dircookies point to the vnode passed in */ @@ -630,12 +632,11 @@ devfs_create(fs_volume _fs, fs_vnode _dir, const char *name, int omode, int perm static status_t devfs_open(fs_volume _fs, fs_vnode _v, int oflags, fs_cookie *_cookie) { - struct devfs *fs = _fs; struct devfs_vnode *vnode = _v; struct devfs_cookie *cookie; status_t status = 0; - TRACE(("devfs_open: fs_cookie %p vnode %p, oflags 0x%x, fs_cookie %p \n", fs, vnode, oflags, _cookie)); + TRACE(("devfs_open: vnode %p, oflags 0x%x, fs_cookie %p \n", vnode, oflags, _cookie)); cookie = malloc(sizeof(struct devfs_cookie)); if (cookie == NULL) @@ -698,7 +699,6 @@ devfs_fsync(fs_volume _fs, fs_vnode _v) static ssize_t devfs_read(fs_volume _fs, fs_vnode _v, fs_cookie _cookie, off_t pos, void *buffer, size_t *length) { - struct devfs *fs = _fs; struct devfs_vnode *vnode = _v; struct devfs_cookie *cookie = _cookie; struct devfs_part_map *part_map; @@ -758,21 +758,6 @@ devfs_write(fs_volume _fs, fs_vnode _v, fs_cookie _cookie, off_t pos, const void } -static off_t -devfs_seek(fs_volume _fs, fs_vnode _v, fs_cookie _cookie, off_t pos, int seekType) -{ -#ifdef DEBUG - struct devfs *fs = _fs; - struct devfs_vnode *vnode = _v; - struct devfs_cookie *cookie = _cookie; - - TRACE(("devfs_seek: vnode %p, cookie %p, pos %Ld, seekType %d\n", vnode, cookie, pos, seekType)); -#endif - - return ESPIPE; -} - - static status_t devfs_create_dir(fs_volume _fs, fs_vnode _dir, const char *name, int perms, vnode_id *new_vnid) { diff --git a/src/kernel/core/fs/pipefs.cpp b/src/kernel/core/fs/pipefs.cpp index fa3387b890..8a1a36b6f0 100644 --- a/src/kernel/core/fs/pipefs.cpp +++ b/src/kernel/core/fs/pipefs.cpp @@ -633,7 +633,9 @@ ReadRequests::Add(read_request &request) request.prev = fLast; request.next = NULL; - fLast = &request; + fLast = &request; + + return B_OK; } @@ -655,6 +657,8 @@ ReadRequests::Remove(read_request &request) if (fFirst == &request) fFirst = request.next; + + return B_OK; } diff --git a/src/kernel/core/fs/rootfs.c b/src/kernel/core/fs/rootfs.c index 8f50373d43..2aa40d671a 100755 --- a/src/kernel/core/fs/rootfs.c +++ b/src/kernel/core/fs/rootfs.c @@ -151,6 +151,7 @@ insert_cookie_in_jar(struct rootfs_vnode *dir, struct rootfs_cookie *cookie) } +#if 0 static void remove_cookie_from_jar(struct rootfs_vnode *dir, struct rootfs_cookie *cookie) { @@ -165,6 +166,7 @@ remove_cookie_from_jar(struct rootfs_vnode *dir, struct rootfs_cookie *cookie) cookie->prev = cookie->next = NULL; } +#endif /* makes sure none of the dircookies point to the vnode passed in */