Changeset 95411 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jun 28, 2022 6:50:10 PM (2 years ago)

Author:

vboxsync

Message:

Linux host and guest drivers: fix clang warnings, bugref:10247.

Location:

trunk/src/VBox/Additions/linux

Files:

• drm/vbox_ttm.c (modified) (3 diffs)
• sharedfolders/dirops.c (modified) (1 diff)
• sharedfolders/utils.c (modified) (2 diffs)
• sharedfolders/vfsmod.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_ttm.c

@@ -796 +796 @@
 {
         struct drm_file *file_priv;
-        struct vbox_private *vbox;
         int ret = -EINVAL;
 
@@ -803 +802 @@
 
         file_priv = filp->private_data;
-        vbox = file_priv->minor->dev->dev_private;
 
 #if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
@@ -810 +808 @@
         ret = drm_gem_mmap(filp, vma);
 #else
-        ret = ttm_bo_mmap(filp, vma, &vbox->ttm.bdev);
+        ret = ttm_bo_mmap(filp, vma, &file_priv->minor->dev->dev_private->ttm.bdev);
 #endif
         return ret;

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -830 +830 @@
             pReq->Create.CreateParms.Info.Attr.fMode         = (S_ISDIR(mode) ? RTFS_TYPE_DIRECTORY : RTFS_TYPE_FILE)
                                                              | sf_access_permissions_to_vbox(mode);
-            pReq->Create.CreateParms.Info.Attr.enmAdditional = RTFSOBJATTRADD_NOTHING;
+            pReq->Create.CreateParms.Info.Attr.enmAdditional = SHFLFSOBJATTRADD_NOTHING;
 
             SFLOGFLOW(("%s calling VbglR0SfHostReqCreate(%s, %#x)\n", pszPrefix, path->String.ach, pReq->Create.CreateParms.CreateFlags));

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -48 +48 @@
         char       *out             = name;
         size_t      out_bound_len   = name_bound_len - 1;
-        size_t      out_len         = 0;
 
         while (in_bound_len) {
@@ -64 +63 @@
                     out           += cbOutEnc;
                     out_bound_len -= cbOutEnc;
-                    out_len       += cbOutEnc;
 
                     in            += cbInEnc;

trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

@@ -194 +194 @@
     if ((unsigned)info->length >= RT_UOFFSETOF(struct vbsf_mount_info_new, enmCacheMode)) {
         switch (info->enmCacheMode) {
-            case kVbsfCacheMode_Default:
+            case kVbsfCacheMode_Default: RT_FALL_THRU();
             case kVbsfCacheMode_Strict:
                 break;
@@ -1140 +1140 @@
             seq_printf(m, ",dirbuf=%u", pSuperInfo->cbDirBuf);
         switch (pSuperInfo->enmCacheMode) {
-            default: AssertFailed();
+            default: AssertFailed(); RT_FALL_THRU();
             case kVbsfCacheMode_Strict:
                 break;