From 77cc5e96c21aac8e1572824a7bf9a2c15ea1ba64 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 5 May 2017 19:05:52 +0300 Subject: Rename virtfsziprwops into fsziprwops. --- src/CMakeLists.txt | 8 +- src/Makefile.am | 4 +- src/fs/virtfs/fszip.cpp | 2 +- src/fs/virtfs/fsziprwops.cpp | 153 +++++++++++++++++++++++++++++++++++++++ src/fs/virtfs/fsziprwops.h | 55 ++++++++++++++ src/fs/virtfs/virtfsziprwops.cpp | 153 --------------------------------------- src/fs/virtfs/virtfsziprwops.h | 55 -------------- 7 files changed, 215 insertions(+), 215 deletions(-) create mode 100644 src/fs/virtfs/fsziprwops.cpp create mode 100644 src/fs/virtfs/fsziprwops.h delete mode 100644 src/fs/virtfs/virtfsziprwops.cpp delete mode 100644 src/fs/virtfs/virtfsziprwops.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5dfa40c6f..e40749d6c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -910,8 +910,8 @@ SET(SRCS fs/virtfs/fsentry.h fs/virtfs/fszip.cpp fs/virtfs/fszip.h - fs/virtfs/virtfsziprwops.cpp - fs/virtfs/virtfsziprwops.h + fs/virtfs/fsziprwops.cpp + fs/virtfs/fsziprwops.h fs/virtfs/virtzipentry.cpp fs/virtfs/virtzipentry.h fs/virtfs/zipreader.cpp @@ -1819,8 +1819,8 @@ SET(DYE_CMD_SRCS fs/virtfs/fsentry.h fs/virtfs/fszip.cpp fs/virtfs/fszip.h - fs/virtfs/virtfsziprwops.cpp - fs/virtfs/virtfsziprwops.h + fs/virtfs/fsziprwops.cpp + fs/virtfs/fsziprwops.h fs/virtfs/virtzipentry.cpp fs/virtfs/virtzipentry.h fs/virtfs/zipreader.cpp diff --git a/src/Makefile.am b/src/Makefile.am index a3b8966d9..a519e491e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -858,8 +858,8 @@ BASE_SRC += events/actionevent.h \ fs/virtfs/fsentry.h \ fs/virtfs/fszip.cpp \ fs/virtfs/fszip.h \ - fs/virtfs/virtfsziprwops.cpp \ - fs/virtfs/virtfsziprwops.h \ + fs/virtfs/fsziprwops.cpp \ + fs/virtfs/fsziprwops.h \ fs/virtfs/virtzipentry.cpp \ fs/virtfs/virtzipentry.h \ fs/virtfs/zipreader.cpp \ diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp index 3781380ae..b114d4740 100644 --- a/src/fs/virtfs/fszip.cpp +++ b/src/fs/virtfs/fszip.cpp @@ -22,7 +22,7 @@ #include "fs/virtfs/file.h" #include "fs/virtfs/fsfuncs.h" -#include "fs/virtfs/virtfsziprwops.h" +#include "fs/virtfs/fsziprwops.h" #include "fs/virtfs/virtlist.h" #include "fs/virtfs/virtzipentry.h" #include "fs/virtfs/zipreader.h" diff --git a/src/fs/virtfs/fsziprwops.cpp b/src/fs/virtfs/fsziprwops.cpp new file mode 100644 index 000000000..d994f6b79 --- /dev/null +++ b/src/fs/virtfs/fsziprwops.cpp @@ -0,0 +1,153 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "fs/virtfs/fsziprwops.h" + +#include "logger.h" + +#include "fs/virtfs/file.h" +#include "fs/virtfs/fs.h" + +#include + +#include "debug.h" + +namespace VirtFs +{ + +namespace FsZip +{ + RWOPSINT rwops_seek(SDL_RWops *const rw, + const RWOPSINT offset, + const int whence) + { + if (!rw) + return -1; + File *const handle = static_cast( + rw->hidden.unknown.data1); + size_t mPos = handle->mPos; + size_t mSize = handle->mSize; + + RWOPSINT pos = 0; + + if (whence == SEEK_SET) + { + pos = offset; + } + else if (whence == SEEK_CUR) + { + const int64_t current = mPos; + if (current == -1) + { + logger->assertLog( + "VirtFs::rwops_seek: Can't find position in file."); + return -1; + } + + pos = CAST_S32(current); + if (static_cast(pos) != current) + { + logger->assertLog("VirtFs::rwops_seek: " + "Can't fit current file position in an int!"); + return -1; + } + + if (offset == 0) /* this is a "tell" call. We're done. */ + return pos; + + pos += offset; + } + else if (whence == SEEK_END) + { + pos = static_cast(mSize + offset); + } + else + { + logger->assertLog( + "VirtFs::rwops_seek: Invalid 'whence' parameter."); + return -1; + } + + if (pos < 0) + { + logger->assertLog("VirtFs::rwops_seek: " + "Attempt to seek past start of file."); + return -1; + } + + handle->mPos = pos; + + if (pos > static_cast(mSize)) + { + logger->assertLog("VirtFs::rwops_seek: seek error."); + return -1; + } + + return pos; + } + + RWOPSSIZE rwops_read(SDL_RWops *const rw, + void *const ptr, + const RWOPSSIZE size, + const RWOPSSIZE maxnum) + { + if (!rw) + return 0; + File *const handle = static_cast( + rw->hidden.unknown.data1); + const int64_t rc = VirtFs::read(handle, ptr, + CAST_U32(size), + CAST_U32(maxnum)); + return CAST_S32(rc); + } + + RWOPSSIZE rwops_write(SDL_RWops *const rw A_UNUSED, + const void *const ptr A_UNUSED, + const RWOPSSIZE size A_UNUSED, + const RWOPSSIZE num A_UNUSED) + { + return 0; + } + + int rwops_close(SDL_RWops *const rw) + { + if (!rw) + return 0; + File *const handle = static_cast( + rw->hidden.unknown.data1); + delete handle; + SDL_FreeRW(rw); + return 0; + } + +#ifdef USE_SDL2 + RWOPSINT rwops_size(SDL_RWops *const rw) + { + if (!rw) + return 0; + File *const handle = static_cast( + rw->hidden.unknown.data1); + return handle->mSize; + } +#endif // USE_SDL2 + +} // namespace FsZip + +} // namespace VirtFs diff --git a/src/fs/virtfs/fsziprwops.h b/src/fs/virtfs/fsziprwops.h new file mode 100644 index 000000000..508b2213c --- /dev/null +++ b/src/fs/virtfs/fsziprwops.h @@ -0,0 +1,55 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UTILS_VIRTFS_VIRTFSZIPRWOPS_H +#define UTILS_VIRTFS_VIRTFSZIPRWOPS_H + +#include "fs/virtfs/rwopstypes.h" + +#include "localconsts.h" + +struct SDL_RWops; + +namespace VirtFs +{ + +namespace FsZip +{ + RWOPSINT rwops_seek(SDL_RWops *const rw, + const RWOPSINT offset, + const int whence); + RWOPSSIZE rwops_read(SDL_RWops *const rw, + void *const ptr, + const RWOPSSIZE size, + const RWOPSSIZE maxnum); + RWOPSSIZE rwops_write(SDL_RWops *const rw, + const void *const ptr, + const RWOPSSIZE size, + const RWOPSSIZE num); + int rwops_close(SDL_RWops *const rw); +#ifdef USE_SDL2 + RWOPSINT rwops_size(SDL_RWops *const rw); +#endif // USE_SDL2 + +} // namespace FsZip + +} // namespace VirtFs + +#endif // UTILS_VIRTFS_VIRTFSZIPRWOPS_H diff --git a/src/fs/virtfs/virtfsziprwops.cpp b/src/fs/virtfs/virtfsziprwops.cpp deleted file mode 100644 index 60199cc83..000000000 --- a/src/fs/virtfs/virtfsziprwops.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "fs/virtfs/virtfsziprwops.h" - -#include "logger.h" - -#include "fs/virtfs/file.h" -#include "fs/virtfs/fs.h" - -#include - -#include "debug.h" - -namespace VirtFs -{ - -namespace FsZip -{ - RWOPSINT rwops_seek(SDL_RWops *const rw, - const RWOPSINT offset, - const int whence) - { - if (!rw) - return -1; - File *const handle = static_cast( - rw->hidden.unknown.data1); - size_t mPos = handle->mPos; - size_t mSize = handle->mSize; - - RWOPSINT pos = 0; - - if (whence == SEEK_SET) - { - pos = offset; - } - else if (whence == SEEK_CUR) - { - const int64_t current = mPos; - if (current == -1) - { - logger->assertLog( - "VirtFs::rwops_seek: Can't find position in file."); - return -1; - } - - pos = CAST_S32(current); - if (static_cast(pos) != current) - { - logger->assertLog("VirtFs::rwops_seek: " - "Can't fit current file position in an int!"); - return -1; - } - - if (offset == 0) /* this is a "tell" call. We're done. */ - return pos; - - pos += offset; - } - else if (whence == SEEK_END) - { - pos = static_cast(mSize + offset); - } - else - { - logger->assertLog( - "VirtFs::rwops_seek: Invalid 'whence' parameter."); - return -1; - } - - if (pos < 0) - { - logger->assertLog("VirtFs::rwops_seek: " - "Attempt to seek past start of file."); - return -1; - } - - handle->mPos = pos; - - if (pos > static_cast(mSize)) - { - logger->assertLog("VirtFs::rwops_seek: seek error."); - return -1; - } - - return pos; - } - - RWOPSSIZE rwops_read(SDL_RWops *const rw, - void *const ptr, - const RWOPSSIZE size, - const RWOPSSIZE maxnum) - { - if (!rw) - return 0; - File *const handle = static_cast( - rw->hidden.unknown.data1); - const int64_t rc = VirtFs::read(handle, ptr, - CAST_U32(size), - CAST_U32(maxnum)); - return CAST_S32(rc); - } - - RWOPSSIZE rwops_write(SDL_RWops *const rw A_UNUSED, - const void *const ptr A_UNUSED, - const RWOPSSIZE size A_UNUSED, - const RWOPSSIZE num A_UNUSED) - { - return 0; - } - - int rwops_close(SDL_RWops *const rw) - { - if (!rw) - return 0; - File *const handle = static_cast( - rw->hidden.unknown.data1); - delete handle; - SDL_FreeRW(rw); - return 0; - } - -#ifdef USE_SDL2 - RWOPSINT rwops_size(SDL_RWops *const rw) - { - if (!rw) - return 0; - File *const handle = static_cast( - rw->hidden.unknown.data1); - return handle->mSize; - } -#endif // USE_SDL2 - -} // namespace FsZip - -} // namespace VirtFs diff --git a/src/fs/virtfs/virtfsziprwops.h b/src/fs/virtfs/virtfsziprwops.h deleted file mode 100644 index 508b2213c..000000000 --- a/src/fs/virtfs/virtfsziprwops.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef UTILS_VIRTFS_VIRTFSZIPRWOPS_H -#define UTILS_VIRTFS_VIRTFSZIPRWOPS_H - -#include "fs/virtfs/rwopstypes.h" - -#include "localconsts.h" - -struct SDL_RWops; - -namespace VirtFs -{ - -namespace FsZip -{ - RWOPSINT rwops_seek(SDL_RWops *const rw, - const RWOPSINT offset, - const int whence); - RWOPSSIZE rwops_read(SDL_RWops *const rw, - void *const ptr, - const RWOPSSIZE size, - const RWOPSSIZE maxnum); - RWOPSSIZE rwops_write(SDL_RWops *const rw, - const void *const ptr, - const RWOPSSIZE size, - const RWOPSSIZE num); - int rwops_close(SDL_RWops *const rw); -#ifdef USE_SDL2 - RWOPSINT rwops_size(SDL_RWops *const rw); -#endif // USE_SDL2 - -} // namespace FsZip - -} // namespace VirtFs - -#endif // UTILS_VIRTFS_VIRTFSZIPRWOPS_H -- cgit v1.2.3-70-g09d2