msi: Remove an extraneous safety check and simplify deformat_string().

739152ce · Gerald Pfeifer · Alexandre Julliard · e169bb0a · 739152ce
Commit 739152ce authored Jan 01, 2008 by Gerald Pfeifer Committed by Alexandre Julliard Jan 02, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 11 deletions

helpers.c dlls/msi/helpers.c +9 -11

No files found.
--- a/dlls/msi/helpers.c
+++ b/dlls/msi/helpers.c
@@ -368,18 +368,16 @@ DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data )

        MSI_RecordSetStringW(rec,0,ptr);
        MSI_FormatRecordW(package,rec,NULL,&size);
-        if (size >= 0)
-        {
-            size++;
-            *data = msi_alloc(size*sizeof(WCHAR));
-            if (size > 1)
-                MSI_FormatRecordW(package,rec,*data,&size);
-            else
-                *data[0] = 0;
-            msiobj_release( &rec->hdr );
-            return sizeof(WCHAR)*size;
-        }
+
+        size++;
+        *data = msi_alloc(size*sizeof(WCHAR));
+        if (size > 1)
+            MSI_FormatRecordW(package,rec,*data,&size);
+        else
+            *data[0] = 0;
+
        msiobj_release( &rec->hdr );
+        return sizeof(WCHAR)*size;
    }

    *data = NULL;