X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fphysfs%2Fphysfs_sdl.cpp;h=277f99370bc3585680939c7642b48c4affc2bc15;hb=1240eda3ac57e6607b206e3c9cf7feb65c3be620;hp=17ceacbe82fb4dfc6f5145e4379082ca43a3d8ca;hpb=0f0e6a3689e5d810ec55b68ff455210b1081a021;p=supertux.git

diff --git a/src/physfs/physfs_sdl.cpp b/src/physfs/physfs_sdl.cpp
index 17ceacbe8..277f99370 100644
--- a/src/physfs/physfs_sdl.cpp
+++ b/src/physfs/physfs_sdl.cpp
@@ -1,94 +1,98 @@
-/*
-Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  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 3 of the License, or
+//  (at your option) 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 <http://www.gnu.org/licenses/>.
 
-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
-(at your option) 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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-#include <config.h>
-
-#include "physfs_sdl.hpp"
+#include "physfs/physfs_sdl.hpp"
 
 #include <physfs.h>
-
-#include <stdexcept>
 #include <sstream>
-#include <iostream>
-
+#include <stdexcept>
 #include <assert.h>
-#include "msg.hpp"
+#include <stdio.h>
+
+#include "util/log.hpp"
 
-static int funcSeek(struct SDL_RWops* context, int offset, int whence)
+static Sint64 funcSeek(struct SDL_RWops* context, Sint64 offset, int whence)
 {
-    PHYSFS_file* file = (PHYSFS_file*) context->hidden.unknown.data1;
-    int res;
-    switch(whence) {
-        case SEEK_SET:
-            res = PHYSFS_seek(file, offset);
-            break;
-        case SEEK_CUR:
-            res = PHYSFS_seek(file, PHYSFS_tell(file) + offset);
-            break;
-        case SEEK_END:
-            res = PHYSFS_seek(file, PHYSFS_fileLength(file) + offset);
-            break;
-        default:
-            res = 0;
-            assert(false);
-            break;
-    }
-    if(res == 0) {
-        msg_warning("Error seeking in file: " << PHYSFS_getLastError());
-        return -1;
-    }
+  PHYSFS_file* file = (PHYSFS_file*) context->hidden.unknown.data1;
+  int res;
+  switch(whence) {
+    case SEEK_SET:
+      res = PHYSFS_seek(file, offset);
+      break;
+    case SEEK_CUR:
+      res = PHYSFS_seek(file, PHYSFS_tell(file) + offset);
+      break;
+    case SEEK_END:
+      res = PHYSFS_seek(file, PHYSFS_fileLength(file) + offset);
+      break;
+    default:
+      res = 0;
+      assert(false);
+      break;
+  }
+  if(res == 0) {
+    log_warning << "Error seeking in file: " << PHYSFS_getLastError() << std::endl;
+    return -1;
+  }
 
-    return (int) PHYSFS_tell(file);
+  return (int) PHYSFS_tell(file);
 }
 
-static int funcRead(struct SDL_RWops* context, void* ptr, int size, int maxnum)
+static size_t  funcRead(struct SDL_RWops* context, void* ptr, size_t  size, size_t  maxnum)
 {
-    PHYSFS_file* file = (PHYSFS_file*) context->hidden.unknown.data1;
+  PHYSFS_file* file = (PHYSFS_file*) context->hidden.unknown.data1;
 
-    int res = PHYSFS_read(file, ptr, size, maxnum);
-    return res;
+  int res = PHYSFS_read(file, ptr, size, maxnum);
+  return res;
 }
 
 static int funcClose(struct SDL_RWops* context)
 {
-    PHYSFS_file* file = (PHYSFS_file*) context->hidden.unknown.data1;
-    
-    PHYSFS_close(file);
-    delete context;
+  PHYSFS_file* file = (PHYSFS_file*) context->hidden.unknown.data1;
+
+  PHYSFS_close(file);
+  delete context;
 
-    return 0;
+  return 0;
 }
 
 SDL_RWops* get_physfs_SDLRWops(const std::string& filename)
 {
-    PHYSFS_file* file = (PHYSFS_file*) PHYSFS_openRead(filename.c_str());
-    if(!file) {
-        std::stringstream msg;
-        msg << "Couldn't open '" << filename << "': "
-            << PHYSFS_getLastError();
-        throw std::runtime_error(msg.str());
-    }
-    
-    SDL_RWops* ops = new SDL_RWops();
-    ops->type = 0;
-    ops->hidden.unknown.data1 = file;
-    ops->seek = funcSeek;
-    ops->read = funcRead;
-    ops->write = 0;
-    ops->close = funcClose;
-    return ops;
+  // check this as PHYSFS seems to be buggy and still returns a
+  // valid pointer in this case
+  if(filename == "") {
+    throw std::runtime_error("Couldn't open file: empty filename");
+  }
+
+  PHYSFS_file* file = (PHYSFS_file*) PHYSFS_openRead(filename.c_str());
+  if(!file) {
+    std::stringstream msg;
+    msg << "Couldn't open '" << filename << "': "
+        << PHYSFS_getLastError();
+    throw std::runtime_error(msg.str());
+  }
+
+  SDL_RWops* ops = new SDL_RWops();
+  ops->type = 0;
+  ops->hidden.unknown.data1 = file;
+  ops->seek = funcSeek;
+  ops->read = funcRead;
+  ops->write = 0;
+  ops->close = funcClose;
+  return ops;
 }
+
+/* EOF */