From 6063b542aa8ad3e09249ded096b502bb62eecfad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Assailly?= Date: Mon, 24 Jan 2005 11:29:44 +0000 Subject: [PATCH] char -> const char fixes. --- dlls/d3d8/shader.c | 2 +- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/joystick_linux.c | 2 +- dlls/oleaut32/tests/vartest.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index be3ca390cb9..76e76c4b8c1 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -1627,7 +1627,7 @@ inline static void addline(int* lineNum, char* pgm, char* line) strcat(pgm, "\n"); } -char* shift_tab[] = { +static const char* shift_tab[] = { "dummy", /* 0 (none) */ "coefmul.x", /* 1 (x2) */ "coefmul.y", /* 2 (x4) */ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 5a5240baa10..4b2df7f2ece 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -195,7 +195,7 @@ HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPU return 0; } -static char *_dump_DIDEVTYPE_value(DWORD dwDevType) { +static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) { switch (dwDevType) { case 0: return "All devices"; case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 7fc2bc10300..76c028cddfb 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -304,7 +304,7 @@ static HRESULT setup_dinput_options(JoystickImpl * device) int tokens = 0; int axis = 0; int pov = 0; - char *delim = ","; + const char *delim = ","; char * ptr; TRACE("\"%s\" = \"%s\"\n", device->name, buffer); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ca3addcda5c..71ebcdaf06c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -101,7 +101,7 @@ static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) } /* return the string text of a given variant type */ -char *vtstr(int x) +static const char *vtstr(int x) { switch(x) { case 0: