From bb8471beace7ab1baf610837c22fd7b3ff30d863 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Wed, 2 Jan 2008 16:30:45 +0100 Subject: [PATCH] msi: Remove an extraneous safety check and simplify generate_error_string(). --- dlls/msi/helpers.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 139a447f38e..90055a1109d 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -1029,20 +1029,14 @@ WCHAR* generate_error_string(MSIPACKAGE *package, UINT error, DWORD count, ... ) va_end(va); 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 data; - } + size++; + data = msi_alloc(size*sizeof(WCHAR)); + if (size > 1) + MSI_FormatRecordW(package,rec,data,&size); + else + data[0] = 0; msiobj_release( &rec->hdr ); - data = NULL; return data; } -- 2.11.4.GIT