From e5938d6fbb0baf8a9b9d37017a262d57e4270426 Mon Sep 17 00:00:00 2001 From: Andrew Talbot Date: Fri, 12 Jan 2007 16:47:21 +0000 Subject: [PATCH] msi: Remove unused variables. --- dlls/msi/registry.c | 22 ---------------------- dlls/msi/table.c | 1 - dlls/msi/tokenize.c | 9 --------- 3 files changed, 32 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bb50ae0bba..1aa1303aa4 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -107,14 +107,6 @@ static const WCHAR szUserProduct_fmt[] = { 'P','r','o','d','u','c','t','s','\\', '%','s',0}; -static const WCHAR szInstaller_Products[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'W','i','n','d','o','w','s','\\', -'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', -'I','n','s','t','a','l','l','e','r','\\', -'P','r','o','d','u','c','t','s',0}; - static const WCHAR szInstaller_Products_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -124,14 +116,6 @@ static const WCHAR szInstaller_Products_fmt[] = { 'P','r','o','d','u','c','t','s','\\', '%','s',0}; -static const WCHAR szInstaller_UpgradeCodes[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'W','i','n','d','o','w','s','\\', -'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', -'I','n','s','t','a','l','l','e','r','\\', -'U','p','g','r','a','d','e','C','o','d','e','s',0}; - static const WCHAR szInstaller_UpgradeCodes_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -141,12 +125,6 @@ static const WCHAR szInstaller_UpgradeCodes_fmt[] = { 'U','p','g','r','a','d','e','C','o','d','e','s','\\', '%','s',0}; -static const WCHAR szInstaller_UserUpgradeCodes[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'I','n','s','t','a','l','l','e','r','\\', -'U','p','g','r','a','d','e','C','o','d','e','s',0}; - static const WCHAR szInstaller_UserUpgradeCodes_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 014c453938..dd611d2e23 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -860,7 +860,6 @@ static const WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; static const WCHAR szTable[] = { 'T','a','b','l','e',0 }; static const WCHAR szName[] = { 'N','a','m','e',0 }; static const WCHAR szColumns[] = { '_','C','o','l','u','m','n','s',0 }; -static const WCHAR szColumn[] = { 'C','o','l','u','m','n',0 }; static const WCHAR szNumber[] = { 'N','u','m','b','e','r',0 }; static const WCHAR szType[] = { 'T','y','p','e',0 }; diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 5a5172be2b..14bcaf2e49 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -44,40 +44,31 @@ static const WCHAR BY_W[] = { 'B','Y',0 }; static const WCHAR CHAR_W[] = { 'C','H','A','R',0 }; static const WCHAR CHARACTER_W[] = { 'C','H','A','R','A','C','T','E','R',0 }; static const WCHAR CREATE_W[] = { 'C','R','E','A','T','E',0 }; -static const WCHAR CROSS_W[] = { 'C','R','O','S','S',0 }; static const WCHAR DELETE_W[] = { 'D','E','L','E','T','E',0 }; static const WCHAR DISTINCT_W[] = { 'D','I','S','T','I','N','C','T',0 }; static const WCHAR FREE_W[] = { 'F','R','E','E',0 }; static const WCHAR FROM_W[] = { 'F','R','O','M',0 }; -static const WCHAR FULL_W[] = { 'F','U','L','L',0 }; static const WCHAR HOLD_W[] = { 'H','O','L','D',0 }; -static const WCHAR INNER_W[] = { 'I','N','N','E','R',0 }; static const WCHAR INSERT_W[] = { 'I','N','S','E','R','T',0 }; static const WCHAR INT_W[] = { 'I','N','T',0 }; static const WCHAR INTEGER_W[] = { 'I','N','T','E','G','E','R',0 }; static const WCHAR INTO_W[] = { 'I','N','T','O',0 }; static const WCHAR IS_W[] = { 'I','S',0 }; -static const WCHAR JOIN_W[] = { 'J','O','I','N',0 }; static const WCHAR KEY_W[] = { 'K','E','Y',0 }; -static const WCHAR LEFT_W[] = { 'L','E','F','T',0 }; static const WCHAR LIKE_W[] = { 'L','I','K','E',0 }; static const WCHAR LOCALIZABLE_W[] = { 'L','O','C','A','L','I','Z','A','B','L','E',0 }; static const WCHAR LONG_W[] = { 'L','O','N','G',0 }; static const WCHAR LONGCHAR_W[] = { 'L','O','N','G','C','H','A','R',0 }; -static const WCHAR NATURAL_W[] = { 'N','A','T','U','R','A','L',0 }; static const WCHAR NOT_W[] = { 'N','O','T',0 }; static const WCHAR NULL_W[] = { 'N','U','L','L',0 }; static const WCHAR OBJECT_W[] = { 'O','B','J','E','C','T',0 }; static const WCHAR OR_W[] = { 'O','R',0 }; static const WCHAR ORDER_W[] = { 'O','R','D','E','R',0 }; -static const WCHAR OUTER_W[] = { 'O','U','T','E','R',0 }; static const WCHAR PRIMARY_W[] = { 'P','R','I','M','A','R','Y',0 }; -static const WCHAR RIGHT_W[] = { 'R','I','G','H','T',0 }; static const WCHAR SELECT_W[] = { 'S','E','L','E','C','T',0 }; static const WCHAR SET_W[] = { 'S','E','T',0 }; static const WCHAR SHORT_W[] = { 'S','H','O','R','T',0 }; static const WCHAR TABLE_W[] = { 'T','A','B','L','E',0 }; -static const WCHAR TEMP_W[] = { 'T','E','M','P',0 }; static const WCHAR TEMPORARY_W[] = { 'T','E','M','P','O','R','A','R','Y',0 }; static const WCHAR UPDATE_W[] = { 'U','P','D','A','T','E',0 }; static const WCHAR VALUES_W[] = { 'V','A','L','U','E','S',0 };