Module: wine Branch: master Commit: 6d6b9a381a13639eabb5c8720468ec0e3aab9005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6b9a381a13639eabb5c87204...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Oct 16 13:58:09 2007 +0200
shlwapi/tests: Make local variables static and const.
---
dlls/shlwapi/tests/url.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b73b872..ebce1e5 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -32,11 +32,11 @@ static HMODULE hShlwapi; static HRESULT (WINAPI *pUrlCanonicalizeW)(LPCWSTR, LPWSTR, LPDWORD, DWORD);
-const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; -const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; -const char* TEST_URL_3 = "http://foo:bar@localhost:21/internal.php?query=x&return=y"; -const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; -const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; +static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; +static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; +static const char* TEST_URL_3 = "http://foo:bar@localhost:21/internal.php?query=x&return=y"; +static const WCHAR winehqW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0}; +static const CHAR winehqA[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/',0};
/* ################ */
@@ -47,7 +47,7 @@ typedef struct _TEST_URL_CANONICALIZE { const char *expecturl; } TEST_URL_CANONICALIZE;
-const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { +static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { /*FIXME {"http://www.winehq.org/tests/../tests/../..", 0, S_OK, "http://www.winehq.org/%22%7D,*/ {"http://www.winehq.org/tests/../tests", 0, S_OK, "http://www.winehq.org/tests%22%7D, {"http://www.winehq.org/tests%5Cn", URL_WININET_COMPATIBILITY|URL_ESCAPE_SPACES_ONLY|URL_ESCAPE_UNSAFE, S_OK, "http://www.winehq.org/tests%22%7D, @@ -100,7 +100,7 @@ typedef struct _TEST_URL_ESCAPE { const char *expecturl; } TEST_URL_ESCAPE;
-const TEST_URL_ESCAPE TEST_ESCAPE[] = { +static const TEST_URL_ESCAPE TEST_ESCAPE[] = { {"http://www.winehq.org/tests0", 0, 0, S_OK, "http://www.winehq.org/tests0%22%7D, {"http://www.winehq.org/tests1%5Cn", 0, 0, S_OK, "http://www.winehq.org/tests1%0A%22%7D, {"http://www.winehq.org/tests2%5Cr", 0, 0, S_OK, "http://www.winehq.org/tests2%0D%22%7D, @@ -191,7 +191,7 @@ typedef struct _TEST_URL_COMBINE { const char *expecturl; } TEST_URL_COMBINE;
-const TEST_URL_COMBINE TEST_COMBINE[] = { +static const TEST_URL_COMBINE TEST_COMBINE[] = { {"http://www.winehq.org/tests", "tests1", 0, S_OK, "http://www.winehq.org/tests1%22%7D, {"http://www.%77inehq.org/tests", "tests1", 0, S_OK, "http://www.%77inehq.org/tests1%22%7D, /*FIXME {"http://www.winehq.org/tests", "../tests2", 0, S_OK, "http://www.winehq.org/tests2%22%7D,*/ @@ -220,7 +220,7 @@ const TEST_URL_COMBINE TEST_COMBINE[] = {
/* ################ */
-struct { +static const struct { const char *path; const char *url; DWORD ret; @@ -242,7 +242,7 @@ struct {
/* ################ */
-struct { +static const struct { char url[30]; const char *expect; } TEST_URL_UNESCAPE[] = { @@ -252,7 +252,7 @@ struct {
/* ################ */
-static struct { +static const struct { const char *path; BOOL expect; } TEST_PATH_IS_URL[] = { @@ -267,7 +267,7 @@ static struct {
/* ################ */
-struct { +static const struct { const char *url; BOOL expectOpaque; BOOL expectFile;