Changeset 26176 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 2, 2010 10:20:13 PM (15 years ago)

Author:

vboxsync

Message:

VBox/err.h,*: Use RT_SUCCESS/FAILURE instead of the VBOX variants, removing the latter.

Location:

trunk/src/VBox/Additions

Files:

• linux/sharedfolders/utils.c (modified) (5 diffs)
• solaris/SharedFolders/vboxfs_prov.c (modified) (7 diffs)

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

@@ -292 +292 @@
 
         rc = vboxCallCreate (&client_handle, &sf_g->map, sf_i->path, &params);
-        if (VBOX_FAILURE (rc)) {
+        if (RT_FAILURE (rc)) {
                 LogFunc(("vboxCallCreate(%s) failed rc=%Rrc\n",
                         sf_i->path->String.utf8, rc));
@@ -342 +342 @@
                                 SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer,
                                 (PSHFLDIRINFO)&info);
-            if (VBOX_FAILURE (rc)) {
+            if (RT_FAILURE (rc)) {
                 LogFunc(("vboxCallFSInfo(%s, FILE) failed rc=%Rrc\n",
                         sf_i->path->String.utf8, rc));
@@ -358 +358 @@
                                 SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuffer,
                                 (PSHFLDIRINFO)&info);
-            if (VBOX_FAILURE (rc)) {
+            if (RT_FAILURE (rc)) {
                 LogFunc(("vboxCallFSInfo(%s, SIZE) failed rc=%Rrc\n",
                         sf_i->path->String.utf8, rc));
@@ -367 +367 @@
 
         rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
-        if (VBOX_FAILURE (rc))
+        if (RT_FAILURE (rc))
         {
                 LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n",
@@ -377 +377 @@
 fail1:
         rc = vboxCallClose (&client_handle, &sf_g->map, params.Handle);
-        if (VBOX_FAILURE (rc))
+        if (RT_FAILURE (rc))
         {
                 LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n",

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c

@@ -124 +124 @@
         str = sfprov_string(path, &size);
         rc = vboxCallMapFolder(&vbox_client, str, &m->map);
-        if (!VBOX_SUCCESS(rc)) {
+        if (!RT_SUCCESS(rc)) {
                 cmn_err(CE_WARN, "sfprov_mount: vboxCallMapFolder() failed");
                 kmem_free(m, sizeof (*m));
@@ -143 +143 @@
 
         rc = vboxCallUnmapFolder(&vbox_client, &mnt->map);
-        if (!VBOX_SUCCESS(rc)) {
+        if (!RT_SUCCESS(rc)) {
                 cmn_err(CE_WARN, "sfprov_mount: vboxCallUnmapFolder() failed");
                 rc = EINVAL;
@@ -165 +165 @@
         rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
             (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
                 return (EINVAL);
         *blksize = info.ulBytesPerAllocationUnit;
@@ -180 +180 @@
         rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
             (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
                 return (EINVAL);
         *blksused = (info.ullTotalAllocationBytes -
@@ -196 +196 @@
         rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
             (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
                 return (EINVAL);
         *blksavail =
@@ -212 +212 @@
         rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
             (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
                 return (EINVAL);
         *maxnamesize = info.fsProperties.cbMaxComponent;
@@ -227 +227 @@
         rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
             (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
                 return (EINVAL);
         *readonly = info.fsProperties.fReadOnly;