Regularize the various VFS seek implementations

Author: white-axe

libretro-common/include/libretro.h

@@ -2834,8 +2834,7 @@ typedef int64_t (RETRO_CALLCONV *retro_vfs_tell_t)(struct retro_vfs_file_handle
  * @param stream The file to set the position of.
  * @param offset The new position, in bytes.
  * @param seek_position The position to seek from.
- * @return The new position,
- * or -1 if there was an error.
+ * @return 0 on success, -1 on failure.
  * @since VFS API v1
  * @see File Seek Positions
  * @see filestream_seek

libretro-common/vfs/vfs_implementation.c

@@ -233,8 +233,6 @@ int64_t retro_vfs_file_seek_internal(
       libretro_vfs_implementation_file *stream,
       int64_t offset, int whence)
 {
-   int64_t val;
-
    if (!stream)
       return -1;
 
@@ -254,7 +252,7 @@ int64_t retro_vfs_file_seek_internal(
 #elif defined(HAVE_64BIT_OFFSETS)
       return fseeko(stream->fp, (off_t)offset, whence);
 #else
-      return fseek(stream->fp, (long)offset, whence);
+      return fseek(stream->fp, (long)offset, whence) != 0 ? -1 : 0;
 #endif
    }
 #ifdef HAVE_MMAP
@@ -298,10 +296,7 @@ int64_t retro_vfs_file_seek_internal(
    }
 #endif
 
-   if ((val = lseek(stream->fd, (off_t)offset, whence)) < 0)
-      return -1;
-
-   return val;
+   return lseek(stream->fd, (off_t)offset, whence) == -1 ? -1 : 0;
 }
 
 /**
@@ -750,8 +745,6 @@ int64_t retro_vfs_file_truncate_impl(libretro_vfs_implementation_file *stream, i
 
 int64_t retro_vfs_file_tell_impl(libretro_vfs_implementation_file *stream)
 {
-   int64_t val;
-
    if (!stream)
       return -1;
 
@@ -781,10 +774,7 @@ int64_t retro_vfs_file_tell_impl(libretro_vfs_implementation_file *stream)
          RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS)
       return stream->mappos;
 #endif
-   if ((val = lseek(stream->fd, 0, SEEK_CUR)) < 0)
-      return -1;
-
-   return val;
+   return lseek(stream->fd, 0, SEEK_CUR);
 }
 
 int64_t retro_vfs_file_seek_impl(libretro_vfs_implementation_file *stream,

libretro-common/vfs/vfs_implementation_smb.c

@@ -249,7 +249,7 @@ static bool smb_build_path(char *dest, size_t dest_size, const char *relative_pa
    settings_t *settings = config_get_ptr();
    char temp_path[PATH_MAX_LENGTH];
    const char *p;
-   
+
    if (!settings)
    {
       RARCH_ERR("[SMB] Cannot retrieve settings\n");
@@ -415,10 +415,8 @@ int64_t retro_vfs_file_write_smb(libretro_vfs_implementation_file *stream,
 int64_t retro_vfs_file_seek_smb(libretro_vfs_implementation_file *stream,
    int64_t offset, int whence)
 {
-   uint64_t newpos = 0;
    struct smb2fh *fh;
    struct smb2_context *ctx;
-   int64_t ret;
 
    if (!smb_initialized || !stream || !stream->smb_ctx)
       return -1;
@@ -440,15 +438,13 @@ int64_t retro_vfs_file_seek_smb(libretro_vfs_implementation_file *stream,
    if (whence != SEEK_SET && whence != SEEK_CUR && whence != SEEK_END)
       return -1;
 
-   /* libsmb2 returns status via ret, and the new offset via out param */
-   ret = smb2_lseek(ctx, fh, offset, whence, &newpos);
-   if (ret < 0)
+   if (smb2_lseek(ctx, fh, offset, whence, NULL) == -EINVAL)
    {
       RARCH_ERR("[SMB] Seek error: %s\n", smb2_get_error(ctx));
       return -1;
    }
 
-   return (int64_t)newpos;
+   return 0;
 }
 
 /* return the current byte offset in an open file */
@@ -457,7 +453,6 @@ int64_t retro_vfs_file_tell_smb(libretro_vfs_implementation_file *stream)
    uint64_t cur = 0;
    struct smb2fh *fh;
    struct smb2_context *ctx;
-   int64_t ret;
 
    if (!smb_initialized || !stream || !stream->smb_ctx)
       return -1;
@@ -473,8 +468,7 @@ int64_t retro_vfs_file_tell_smb(libretro_vfs_implementation_file *stream)
    if (!ctx)
       return -1;
 
-   ret = smb2_lseek(ctx, fh, 0, SEEK_CUR, &cur);
-   if (ret < 0)
+   if (smb2_lseek(ctx, fh, 0, SEEK_CUR, &cur) == -EINVAL)
    {
       RARCH_ERR("[SMB] Tell error: %s\n", smb2_get_error(ctx));
       return -1;

libretro-common/vfs/vfs_implementation_uwp.cpp

@@ -138,10 +138,7 @@ int64_t retro_vfs_file_tell_impl(libretro_vfs_implementation_file* stream)
 #endif
         return _ftelli64(stream->fp);
     }
-    if (lseek(stream->fd, 0, SEEK_CUR) < 0)
-        return -1;
-
-    return 0;
+    return lseek(stream->fd, 0, SEEK_CUR);
 }
 
 int64_t retro_vfs_file_seek_internal(
@@ -159,10 +156,7 @@ int64_t retro_vfs_file_seek_internal(
 #endif
         return _fseeki64(stream->fp, offset, whence);
     }
-    if (lseek(stream->fd, (off_t)offset, whence) < 0)
-        return -1;
-
-    return 0;
+    return lseek(stream->fd, (off_t)offset, whence) == -1 ? -1 : 0;
 }
 
 int64_t retro_vfs_file_seek_impl(libretro_vfs_implementation_file* stream,