From 349ab0050a7038378f9d17b4e6d9083284d9efc6 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 30 Aug 2019 20:53:29 -0400 Subject: [PATCH] ramfs: Fix miscellaneous warnings. --- src/add-ons/kernel/file_systems/ramfs/Query.cpp | 8 ++++---- src/add-ons/kernel/file_systems/ramfs/String.h | 2 -- .../kernel/file_systems/ramfs/kernel_interface.cpp | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/file_systems/ramfs/Query.cpp b/src/add-ons/kernel/file_systems/ramfs/Query.cpp index c6a1cd0c1e..9398f3bfa2 100644 --- a/src/add-ons/kernel/file_systems/ramfs/Query.cpp +++ b/src/add-ons/kernel/file_systems/ramfs/Query.cpp @@ -286,7 +286,7 @@ class Term { virtual bool NeedsEntry() = 0; -#ifdef DEBUG +#if DEBUG virtual void PrintToStream() = 0; #endif @@ -329,7 +329,7 @@ class Equation : public Term { virtual bool NeedsEntry(); -#ifdef DEBUG +#if DEBUG virtual void PrintToStream(); #endif @@ -375,7 +375,7 @@ class Operator : public Term { virtual bool NeedsEntry(); //Term *Copy() const; -#ifdef DEBUG +#if DEBUG virtual void PrintToStream(); #endif @@ -1389,7 +1389,7 @@ Operator::Copy() const // #pragma mark - -#ifdef DEBUG +#if DEBUG void Operator::PrintToStream() { diff --git a/src/add-ons/kernel/file_systems/ramfs/String.h b/src/add-ons/kernel/file_systems/ramfs/String.h index f02f115b3c..48921567cb 100644 --- a/src/add-ons/kernel/file_systems/ramfs/String.h +++ b/src/add-ons/kernel/file_systems/ramfs/String.h @@ -127,9 +127,7 @@ String::Truncate(int32 newLength) newLength = 0; if (newLength < fLength) { char *string = fString; - int32 len = fLength; fString = NULL; - len = 0; if (!_SetTo(string, newLength)) { fString = string; fLength = newLength; diff --git a/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp index 89fea48c0e..6f8d803689 100644 --- a/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/ramfs/kernel_interface.cpp @@ -147,7 +147,7 @@ ramfs_read_fs_info(fs_volume* _volume, struct fs_info *info) strcpy(info->fsh_name, "ramfs"); } else SET_ERROR(error, B_ERROR); - return B_OK; + return error; } @@ -916,7 +916,7 @@ ramfs_close(fs_volume* _volume, fs_vnode* _node, void* /*cookie*/) notify_if_stat_changed(volume, node); } else SET_ERROR(error, B_ERROR); - return B_OK; + return error; } @@ -1632,8 +1632,7 @@ ramfs_close_attr(fs_volume* _volume, fs_vnode* _node, void* _cookie) notify_if_stat_changed(volume, node); } else SET_ERROR(error, B_ERROR); - return B_OK; - + return error; }