[PATCH 2/2] msi: whitespace cleanup. Use git blame -w to skip.

Nathan Gallaher ngallaher at deepthought.org
Sat Jan 2 12:37:13 CST 2010


From f51f939bf9dc4e1af5dd6b8a42f9c071dc4de09a Mon Sep 17 00:00:00 2001
From: Nathan Gallaher <ngallaher at deepthought.org>
Date: Sat, 2 Jan 2010 13:32:45 -0500
Subject: msi: whitespace cleanup. Use git blame -w to skip this.

Death to trailing whitespace and literal tabs.
---
 dlls/msi/cond.y |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y
index 95a709b..b8f91bb 100644
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -136,14 +136,14 @@ static BOOL num_from_prop( LPCWSTR p, INT *val )
 
 %nonassoc COND_ERROR COND_EOF
 
-%type <value> expression boolean_term boolean_factor 
+%type <value> expression boolean_term boolean_factor
 %type <value> value_i integer operator
 %type <string> identifier symbol_s value_s literal
 
 %%
 
 condition:
-    expression 
+    expression
         {
             COND_input* cond = (COND_input*) info;
             cond->result = $1;
@@ -156,7 +156,7 @@ condition:
     ;
 
 expression:
-    boolean_term 
+    boolean_term
         {
             $$ = $1;
         }
@@ -212,7 +212,7 @@ boolean_factor:
             int num;
             if (num_from_prop( $1, &num ))
                 $$ = compare_int( num, $2, $3 );
-            else 
+            else
                 $$ = ($2 == COND_NE || $2 == COND_INE );
             cond_free( info, $1 );
         }
@@ -221,7 +221,7 @@ boolean_factor:
             int num;
             if (num_from_prop( $3, &num ))
                 $$ = compare_int( $1, $2, num );
-            else 
+            else
                 $$ = ($2 == COND_NE || $2 == COND_INE );
             cond_free( info, $3 );
         }
@@ -283,7 +283,7 @@ value_s:
     symbol_s
     {
         $$ = $1;
-    } 
+    }
   | literal
     {
         $$ = $1;
@@ -308,7 +308,7 @@ value_i:
         {
             COND_input* cond = (COND_input*) info;
             INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN;
-      
+
             MSI_GetComponentStateW(cond->package, $2, &install, &action );
             $$ = action;
             cond_free( info, $2 );
@@ -317,7 +317,7 @@ value_i:
         {
             COND_input* cond = (COND_input*) info;
             INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN;
-      
+
             MSI_GetComponentStateW(cond->package, $2, &install, &action );
             $$ = install;
             cond_free( info, $2 );
@@ -326,7 +326,7 @@ value_i:
         {
             COND_input* cond = (COND_input*) info;
             INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN;
-      
+
             MSI_GetFeatureStateW(cond->package, $2, &install, &action );
             if (action == INSTALLSTATE_UNKNOWN)
                 $$ = MSICONDITION_FALSE;
@@ -339,7 +339,7 @@ value_i:
         {
             COND_input* cond = (COND_input*) info;
             INSTALLSTATE install = INSTALLSTATE_UNKNOWN, action = INSTALLSTATE_UNKNOWN;
-      
+
             MSI_GetFeatureStateW(cond->package, $2, &install, &action );
             $$ = install;
             cond_free( info, $2 );
@@ -457,15 +457,15 @@ static INT compare_substring( LPCWSTR a, INT operator, LPCWSTR b )
     case COND_ISS:
         return strstriW( a, b ) ? 1 : 0;
     case COND_LHS:
-    	return 0 == strncmpW( a, b, lstrlenW( b ) );
+        return 0 == strncmpW( a, b, lstrlenW( b ) );
     case COND_RHS:
-    	return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b );
+        return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b );
     case COND_ILHS:
-    	return 0 == strncmpiW( a, b, lstrlenW( b ) );
+        return 0 == strncmpiW( a, b, lstrlenW( b ) );
     case COND_IRHS:
         return 0 == lstrcmpiW( a + (lstrlenW( a ) - lstrlenW( b )), b );
     default:
-    	ERR("invalid substring operator\n");
+        ERR("invalid substring operator\n");
         return 0;
     }
     return 0;
@@ -475,7 +475,7 @@ static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b, BOOL convert )
 {
     if (operator >= COND_SS && operator <= COND_RHS)
         return compare_substring( a, operator, b );
-	
+
     /* null and empty string are equivalent */
     if (!a) a = szEmpty;
     if (!b) b = szEmpty;
@@ -642,7 +642,7 @@ static int COND_GetOne( struct cond_str *str, COND_input *cond )
     if (ch == '"' )
     {
         LPCWSTR p = strchrW( str->data + 1, '"' );
-	if (!p)
+        if (!p)
             return COND_ERROR;
         len = p - str->data + 1;
         rc = COND_LITER;
@@ -702,7 +702,7 @@ static int cond_lex( void *COND_lval, COND_input *cond )
     do {
         rc = COND_GetOne( str, cond );
     } while (rc == COND_SPACE);
-    
+
     return rc;
 }
 
@@ -794,7 +794,7 @@ MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *package, LPCWSTR szCondition )
     TRACE("%s\n", debugstr_w( szCondition ) );
 
     if ( szCondition == NULL )
-    	return MSICONDITION_NONE;
+        return MSICONDITION_NONE;
 
     cond.package = package;
     cond.str   = szCondition;
-- 
1.6.0.4



More information about the wine-patches mailing list