Michael Stefaniuc : msi: Simplify check for an empty string (PVS-Studio).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 481ff775ca281098b6c69d615a3e7c2f07ed10cd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=481ff775ca281098b6c69d615a...

Author: Michael Stefaniuc 
Date:   Wed Nov  5 10:53:56 2014 +0100

msi: Simplify check for an empty string (PVS-Studio).

---

dlls/msi/dialog.c        | 2 +-
 dlls/msi/script.c        | 2 +-
 dlls/msi/tests/action.c  | 2 +-
 dlls/msi/tests/db.c      | 4 ++--
 dlls/msi/tests/package.c | 4 ++--
 dlls/msi/tests/source.c  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 4e1052e..4380879 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -2171,7 +2171,7 @@ static void msi_dialog_update_pathedit( msi_dialog *dialog, msi_control *control
 /* FIXME: test when this should fail */
 static BOOL msi_dialog_verify_path( LPWSTR path )
 {
-    if ( !lstrlenW( path ) )
+    if ( !path[0] )
         return FALSE;

if ( PathIsRelativeW( path ) )
diff --git a/dlls/msi/script.c b/dlls/msi/script.c
index 0fec716..c70790f 100644
--- a/dlls/msi/script.c
+++ b/dlls/msi/script.c
@@ -356,7 +356,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function
     if (FAILED(hr)) goto done;

/* Call a function if necessary through the IDispatch interface */
-    if (function != NULL && strlenW(function) > 0) {
+    if (function && function[0]) {
         TRACE("Calling function %s\n", debugstr_w(function));

hr = IActiveScript_GetScriptDispatch(pActiveScript, NULL, &pDispatch);
diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c
index a8903d9..bd074a2 100644
--- a/dlls/msi/tests/action.c
+++ b/dlls/msi/tests/action.c
@@ -2715,7 +2715,7 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase
     }

if (!expected)
-        ok_(__FILE__, line)(lstrlenA(val) == 0, "Expected empty string, got %s\n", val);
+        ok_(__FILE__, line)(!val[0], "Expected empty string, got %s\n", val);
     else
     {
         if (bcase)
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index af8ac8c..5ac9035 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -4534,7 +4534,7 @@ static void test_update(void)
     size = MAX_PATH;
     r = MsiRecordGetStringA(rec, 1, result, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(!lstrlenA(result), "Expected an empty string, got %s\n", result);
+    ok(!result[0], "Expected an empty string, got %s\n", result);

MsiCloseHandle(rec);

@@ -4580,7 +4580,7 @@ static void test_update(void)
     size = MAX_PATH;
     r = MsiRecordGetStringA(rec, 1, result, &size);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(!lstrlenA(result), "Expected an empty string, got %s\n", result);
+    ok(!result[0], "Expected an empty string, got %s\n", result);

MsiCloseHandle(rec);

diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 1a5935d..28d3e54 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -2194,7 +2194,7 @@ static void test_props(void)
     sz = 6;
     r = MsiGetPropertyA(hpkg, "property", buffer, &sz);
     ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok( !strlen(buffer), "Expected empty string, got %s\n", buffer);
+    ok(!buffer[0], "Expected empty string, got %s\n", buffer);

MsiCloseHandle( hpkg );
     DeleteFileA(msifile);
@@ -2347,7 +2347,7 @@ static void test_property_table(void)
     lstrcpyA(buffer, "aaa");
     r = MsiGetPropertyA(hpkg, "dantes", buffer, &sz);
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
-    ok(lstrlenA(buffer) == 0, "Expected empty string, got %s\n", buffer);
+    ok(!buffer[0], "Expected empty string, got %s\n", buffer);

r = MsiSetPropertyA(hpkg, "dantes", "mercedes");
     ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c
index 9fddd90..1ef3c9d 100644
--- a/dlls/msi/tests/source.c
+++ b/dlls/msi/tests/source.c
@@ -176,7 +176,7 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase
     }

if (!expected)
-        ok_(__FILE__, line)(lstrlenA(val) == 0, "Expected empty string, got %s\n", val);
+        ok_(__FILE__, line)(!val[0], "Expected empty string, got %s\n", val);
     else
     {
         if (bcase)