From cf9f0007c7ac888197d591ff219b1f335d4fc09a Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 11 Mar 2014 10:41:25 +0200 Subject: libw32dll: fix const issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Casting const away is usually bad idea. It does not fix the cause (incorrect types). Also, casting const away issues warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type --- src/libw32dll/DirectShow/DS_AudioDecoder.c | 2 +- src/libw32dll/DirectShow/DS_AudioDecoder.h | 2 +- src/libw32dll/DirectShow/DS_VideoDecoder.c | 2 +- src/libw32dll/DirectShow/DS_VideoDecoder.h | 2 +- src/libw32dll/common.c | 8 ++++---- src/libw32dll/dmo/DMO_AudioDecoder.c | 2 +- src/libw32dll/dmo/DMO_AudioDecoder.h | 2 +- src/libw32dll/dmo/DMO_VideoDecoder.c | 2 +- src/libw32dll/dmo/DMO_VideoDecoder.h | 2 +- src/libw32dll/qtx/qtxsdk/components.h | 4 ++-- src/libw32dll/w32codec.c | 6 +++--- src/libw32dll/wine/pe_image.c | 4 ++-- src/libw32dll/wine/win32.c | 2 +- src/libw32dll/wine/win32.h | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/libw32dll/DirectShow/DS_AudioDecoder.c b/src/libw32dll/DirectShow/DS_AudioDecoder.c index 84e84747e..c411095e1 100644 --- a/src/libw32dll/DirectShow/DS_AudioDecoder.c +++ b/src/libw32dll/DirectShow/DS_AudioDecoder.c @@ -33,7 +33,7 @@ struct _DS_AudioDecoder typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**); -DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf) +DS_AudioDecoder * DS_AudioDecoder_Open(const char* dllname, GUID* guid, WAVEFORMATEX* wf) //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf) { DS_AudioDecoder *this; diff --git a/src/libw32dll/DirectShow/DS_AudioDecoder.h b/src/libw32dll/DirectShow/DS_AudioDecoder.h index 9628f65d2..c88da50f8 100644 --- a/src/libw32dll/DirectShow/DS_AudioDecoder.h +++ b/src/libw32dll/DirectShow/DS_AudioDecoder.h @@ -4,7 +4,7 @@ typedef struct _DS_AudioDecoder DS_AudioDecoder; //DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); -DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf); +DS_AudioDecoder * DS_AudioDecoder_Open(const char* dllname, GUID* guid, WAVEFORMATEX* wf); void DS_AudioDecoder_Destroy(DS_AudioDecoder *this); diff --git a/src/libw32dll/DirectShow/DS_VideoDecoder.c b/src/libw32dll/DirectShow/DS_VideoDecoder.c index f88e480e3..b179b1a34 100644 --- a/src/libw32dll/DirectShow/DS_VideoDecoder.c +++ b/src/libw32dll/DirectShow/DS_VideoDecoder.c @@ -82,7 +82,7 @@ static ct check[] = { }; -DS_VideoDecoder * DS_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto) +DS_VideoDecoder * DS_VideoDecoder_Open(const char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto) { DS_VideoDecoder *this; HRESULT result; diff --git a/src/libw32dll/DirectShow/DS_VideoDecoder.h b/src/libw32dll/DirectShow/DS_VideoDecoder.h index 82e76f66a..889728799 100644 --- a/src/libw32dll/DirectShow/DS_VideoDecoder.h +++ b/src/libw32dll/DirectShow/DS_VideoDecoder.h @@ -5,7 +5,7 @@ typedef struct _DS_VideoDecoder DS_VideoDecoder; int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this); -DS_VideoDecoder * DS_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto); +DS_VideoDecoder * DS_VideoDecoder_Open(const char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto); void DS_VideoDecoder_Destroy(DS_VideoDecoder *this); diff --git a/src/libw32dll/common.c b/src/libw32dll/common.c index 6b5268a70..435d7c9e7 100644 --- a/src/libw32dll/common.c +++ b/src/libw32dll/common.c @@ -2,10 +2,10 @@ #include #endif -static char *get_win32_codecs_path(config_values_t *cfg) { +static const char *get_win32_codecs_path(config_values_t *cfg) { DIR *dir; - char *path, *cfgpath; - const char *listpath[] = { "", + const char *path, *cfgpath; + const char * const listpath[] = { "", "/usr/lib/codecs", "/usr/local/lib/codecs", "/usr/lib/win32", @@ -25,7 +25,7 @@ static char *get_win32_codecs_path(config_values_t *cfg) { while (listpath[i]) { if (i == 0) path = cfgpath; - else path = (char *)listpath[i]; + else path = listpath[i]; if ((dir = opendir(path)) != NULL) { closedir(dir); diff --git a/src/libw32dll/dmo/DMO_AudioDecoder.c b/src/libw32dll/dmo/DMO_AudioDecoder.c index f2a1bfb5c..13364c812 100644 --- a/src/libw32dll/dmo/DMO_AudioDecoder.c +++ b/src/libw32dll/dmo/DMO_AudioDecoder.c @@ -38,7 +38,7 @@ struct _DMO_AudioDecoder typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**); extern void print_wave_header(WAVEFORMATEX *h); -DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels) +DMO_AudioDecoder * DMO_AudioDecoder_Open(const char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels) //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf) { DMO_AudioDecoder *this; diff --git a/src/libw32dll/dmo/DMO_AudioDecoder.h b/src/libw32dll/dmo/DMO_AudioDecoder.h index ed571f465..0112d2743 100644 --- a/src/libw32dll/dmo/DMO_AudioDecoder.h +++ b/src/libw32dll/dmo/DMO_AudioDecoder.h @@ -4,7 +4,7 @@ typedef struct _DMO_AudioDecoder DMO_AudioDecoder; //DMO_AudioDecoder * DMO_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf); -DMO_AudioDecoder * DMO_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels); +DMO_AudioDecoder * DMO_AudioDecoder_Open(const char* dllname, GUID* guid, WAVEFORMATEX* wf,int out_channels); void DMO_AudioDecoder_Destroy(DMO_AudioDecoder *this); diff --git a/src/libw32dll/dmo/DMO_VideoDecoder.c b/src/libw32dll/dmo/DMO_VideoDecoder.c index 64b0ef78c..4b95bcfa7 100644 --- a/src/libw32dll/dmo/DMO_VideoDecoder.c +++ b/src/libw32dll/dmo/DMO_VideoDecoder.c @@ -90,7 +90,7 @@ static ct check[] = { {0}, }; -DMO_VideoDecoder * DMO_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto) +DMO_VideoDecoder * DMO_VideoDecoder_Open(const char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto) { DMO_VideoDecoder *this; HRESULT result; diff --git a/src/libw32dll/dmo/DMO_VideoDecoder.h b/src/libw32dll/dmo/DMO_VideoDecoder.h index 1f48523a1..7aa52d570 100644 --- a/src/libw32dll/dmo/DMO_VideoDecoder.h +++ b/src/libw32dll/dmo/DMO_VideoDecoder.h @@ -5,7 +5,7 @@ typedef struct _DMO_VideoDecoder DMO_VideoDecoder; int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this); -DMO_VideoDecoder * DMO_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto); +DMO_VideoDecoder * DMO_VideoDecoder_Open(const char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto); void DMO_VideoDecoder_Destroy(DMO_VideoDecoder *this); diff --git a/src/libw32dll/qtx/qtxsdk/components.h b/src/libw32dll/qtx/qtxsdk/components.h index 11e0824c9..49abbe760 100644 --- a/src/libw32dll/qtx/qtxsdk/components.h +++ b/src/libw32dll/qtx/qtxsdk/components.h @@ -673,12 +673,12 @@ static inline void dump_ImageDescription(void* xxx){ printf("=========================================================\n"); } -static inline void dump_Rect(char* title,Rect *r){ +static inline void dump_Rect(const char* title,Rect *r){ printf("%s: %d;%d - %d;%d\n",title, (int)r->top,(int)r->left,(int)r->bottom,(int)r->right); } -static inline void dump_MatrixRecord(char* title, MatrixRecord *m){ +static inline void dump_MatrixRecord(const char* title, MatrixRecord *m){ printf("%s: [%ld %ld %ld][%ld %ld %ld][%ld %ld %ld]\n",title, m->matrix[0][0],m->matrix[0][1],m->matrix[0][2], m->matrix[1][0],m->matrix[1][1],m->matrix[1][2], diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 19420af19..2de8e9d7c 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -134,7 +134,7 @@ static GUID wmav_clsid = */ static pthread_mutex_t win32_codec_mutex; static pthread_once_t once_control = PTHREAD_ONCE_INIT; -static char* win32_codec_name; +static const char* win32_codec_name; #define VIDEOBUFSIZE 128*1024 @@ -801,7 +801,7 @@ static void w32v_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { int i; for (i = 1; i <= num_decoders; i++) { - win32_codec_name = (char *)get_vids_codec_name (this, buf->type, i); + win32_codec_name = get_vids_codec_name (this, buf->type, i); if( this->driver_type == DRIVER_STD ) w32v_init_codec (this, buf->type); @@ -1206,7 +1206,7 @@ static int w32a_init_audio (w32a_decoder_t *this, wf.cbSize = 0; this->ldt_fs = Setup_LDT_Keeper(); - win32_codec_name = (char *)get_auds_codec_name (this, buftype); + win32_codec_name = get_auds_codec_name (this, buftype); if( this->driver_type == DRIVER_STD ) { diff --git a/src/libw32dll/wine/pe_image.c b/src/libw32dll/wine/pe_image.c index 1366cc396..8ee482ece 100644 --- a/src/libw32dll/wine/pe_image.c +++ b/src/libw32dll/wine/pe_image.c @@ -212,7 +212,7 @@ FARPROC PE_FindExportedFunction( FARPROC proc = RVA(addr); if (snoop) { - if (!ename) ename = "@"; +// if (!ename) ename = "@"; // proc = SNOOP_GetProcAddress(wm->module,ename,ordinal,proc); TRACE("SNOOP_GetProcAddress n/a\n"); @@ -245,7 +245,7 @@ static DWORD fixup_imports( WINE_MODREF *wm ) PE_MODREF *pem; unsigned int load_addr = wm->module; int i,characteristics_detection=1; - char *modname; + const char *modname; assert(wm->type==MODULE32_PE); pem = &(wm->binfmt.pe); diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c index aba172711..325b365af 100644 --- a/src/libw32dll/wine/win32.c +++ b/src/libw32dll/wine/win32.c @@ -79,7 +79,7 @@ static int vsscanf( const char *str, const char *format, va_list ap) } #endif -char* win32_def_path = WIN32_PATH; +const char* win32_def_path = WIN32_PATH; static void do_cpuid(unsigned int ax, unsigned int *regs) { diff --git a/src/libw32dll/wine/win32.h b/src/libw32dll/wine/win32.h index 23590b320..5cf7f9239 100644 --- a/src/libw32dll/wine/win32.h +++ b/src/libw32dll/wine/win32.h @@ -7,7 +7,7 @@ #include "winbase.h" #include "com.h" -extern char* win32_def_path; +extern const char* win32_def_path; extern void my_garbagecollection(void); -- cgit v1.2.3