Changeset 79200 in vbox

Timestamp:

Jun 18, 2019 8:53:44 AM (5 years ago)

Author:

vboxsync

Message:

iprt/file.h,createtemp-generic.cpp: nits

Location:

trunk

Files:

• include/iprt/file.h (modified) (1 diff)
• src/VBox/Runtime/generic/createtemp-generic.cpp (modified) (8 diffs)

trunk/include/iprt/file.h

@@ -982 +982 @@
  * platform-by-platform basis as platform support is added.
  * @see RTPathIsSecure for the current list of criteria.
+ *
  * @returns iprt status code.
  * @returns VERR_NOT_SUPPORTED if the interface can not be supported on the

trunk/src/VBox/Runtime/generic/createtemp-generic.cpp

@@ -40 +40 @@
 
 
-static int rtCreateTempValidateTemplate(char *pszTemplate, char **ppszX,
-                                        unsigned *pcXes)
-{
-    /*
-     * Validate input and count X'es.
-     *
-     * The X'es may be trailing, or they may be a cluster of 3 or more inside
-     * the file name.
-     */
+/**
+ * The X'es may be trailing, or they may be a cluster of 3 or more inside
+ * the file name.
+ */
+static int rtCreateTempValidateTemplate(char *pszTemplate, char **ppszX, unsigned *pcXes)
+{
     AssertPtr(pszTemplate);
     AssertPtr(ppszX);
     AssertPtr(pcXes);
+
     unsigned    cXes = 0;
     char       *pszX = strchr(pszTemplate, '\0');
@@ -66 +64 @@
             do
             {
-                if (    pszXEnd[-1] == 'X'
-                    &&  pszXEnd[-2] == 'X'
-                    &&  pszXEnd[-3] == 'X')
+                if (   pszXEnd[-1] == 'X'
+                    && pszXEnd[-2] == 'X'
+                    && pszXEnd[-3] == 'X')
                 {
                     pszX = pszXEnd - 3;
@@ -87 +85 @@
 
     /* fail if none found. */
-    if (!cXes)
-    {
-        AssertFailed();
-        return VERR_INVALID_PARAMETER;
-    }
     *ppszX = pszX;
     *pcXes = cXes;
+    AssertReturn(cXes > 0, VERR_INVALID_PARAMETER);
     return VINF_SUCCESS;
 }
@@ -144 +138 @@
 RTDECL(int) RTDirCreateTempSecure(char *pszTemplate)
 {
-    size_t cchDir;
-    char chOld;
-    int rc;
     /* bool fSafe; */
 
     /* Temporarily convert pszTemplate to a path. */
+    size_t cchDir = 0;
     RTPathParseSimple(pszTemplate, &cchDir, NULL, NULL);
-    chOld = pszTemplate[cchDir];
+    char chOld = pszTemplate[cchDir];
     pszTemplate[cchDir] = '\0';
     /** @todo Implement this. */
-    rc = /* RTPathIsSecure(pszTemplate, &fSafe) */ VERR_NOT_SUPPORTED;
+    int rc = /* RTPathIsSecure(pszTemplate, &fSafe) */ VERR_NOT_SUPPORTED;
     pszTemplate[cchDir] = chOld;
     if (RT_SUCCESS(rc) /* && fSafe */)
         return RTDirCreateTemp(pszTemplate, 0700);
-    else
-    {
-        *pszTemplate = '\0';
-        /** @todo Replace VERR_PERMISSION_DENIED.  VERR_INSECURE? */
-        return RT_FAILURE(rc) ? rc : VERR_PERMISSION_DENIED;
-    }
+
+    *pszTemplate = '\0';
+    /** @todo Replace VERR_PERMISSION_DENIED.  VERR_INSECURE? */
+    return RT_FAILURE(rc) ? rc : VERR_PERMISSION_DENIED;
 }
 RT_EXPORT_SYMBOL(RTDirCreateTempSecure);
@@ -172 +162 @@
     char       *pszX = NULL;
     unsigned    cXes = 0;
-    RTFILE      hFile;
     int rc = rtCreateTempValidateTemplate(pszTemplate, &pszX, &cXes);
     if (RT_FAILURE(rc))
@@ -179 +168 @@
         return rc;
     }
+
     /*
      * Try ten thousand times.
@@ -185 +175 @@
     while (i-- > 0)
     {
-        uint64_t fOpen =   RTFILE_O_WRITE | RTFILE_O_DENY_ALL
-                         | RTFILE_O_CREATE | RTFILE_O_NOT_CONTENT_INDEXED
-                         | fMode << RTFILE_O_CREATE_MODE_SHIFT;
+        uint64_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_ALL | RTFILE_O_CREATE | RTFILE_O_NOT_CONTENT_INDEXED
+                       | fMode << RTFILE_O_CREATE_MODE_SHIFT;
         rtCreateTempFillTemplate(pszX, cXes);
+        RTFILE hFile = NIL_RTFILE;
         rc = RTFileOpen(&hFile, pszTemplate, fOpen);
         if (RT_SUCCESS(rc))
@@ -213 +203 @@
 RTDECL(int) RTFileCreateTempSecure(char *pszTemplate)
 {
-    size_t cchDir;
-    char chOld;
-    int rc;
     /* bool fSafe; */
 
     /* Temporarily convert pszTemplate to a path. */
+    size_t cchDir = 0;
     RTPathParseSimple(pszTemplate, &cchDir, NULL, NULL);
-    chOld = pszTemplate[cchDir];
+    char chOld = pszTemplate[cchDir];
     pszTemplate[cchDir] = '\0';
     /** @todo Implement this. */
-    rc = /* RTPathIsSecure(pszTemplate, &fSafe) */ VERR_NOT_SUPPORTED;
+    int rc = /* RTPathIsSecure(pszTemplate, &fSafe) */ VERR_NOT_SUPPORTED;
     pszTemplate[cchDir] = chOld;
     if (RT_SUCCESS(rc) /* && fSafe */)
         return RTFileCreateTemp(pszTemplate, 0600);
-    else
-    {
-        *pszTemplate = '\0';
-        /** @todo Replace VERR_PERMISSION_DENIED.  VERR_INSECURE? */
-        return RT_FAILURE(rc) ? rc : VERR_PERMISSION_DENIED;
-    }
+
+    *pszTemplate = '\0';
+    /** @todo Replace VERR_PERMISSION_DENIED.  VERR_INSECURE? */
+    return RT_FAILURE(rc) ? rc : VERR_PERMISSION_DENIED;
 }
 RT_EXPORT_SYMBOL(RTFileCreateTempSecure);