# HG changeset patch # User reimar # Date 1267138024 0 # Node ID 9a49143918aad4ab0f0782d8514089ea132592e1 # Parent 71c816ff3ab4ecdf19d2e7c39f9ea21dfa078d00 Mark stream open filename parameter as const, the filename string is not modified by these functions. diff -r 71c816ff3ab4 -r 9a49143918aa stream/open.c --- a/stream/open.c Thu Feb 25 22:44:02 2010 +0000 +++ b/stream/open.c Thu Feb 25 22:47:04 2010 +0000 @@ -47,7 +47,7 @@ // Open a new stream (stdin/file/vcd/url) -stream_t* open_stream(char* filename,char** options, int* file_format){ +stream_t* open_stream(const char* filename,char** options, int* file_format){ // Check if playlist or unknown if (*file_format != DEMUXER_TYPE_PLAYLIST){ *file_format=DEMUXER_TYPE_UNKNOWN; diff -r 71c816ff3ab4 -r 9a49143918aa stream/stream.c --- a/stream/stream.c Thu Feb 25 22:44:02 2010 +0000 +++ b/stream/stream.c Thu Feb 25 22:47:04 2010 +0000 @@ -140,7 +140,7 @@ NULL }; -static stream_t* open_stream_plugin(const stream_info_t* sinfo, char* filename, +static stream_t* open_stream_plugin(const stream_info_t* sinfo, const char* filename, int mode, char** options, int* file_format, int* ret, char** redirected_url) { @@ -208,7 +208,7 @@ } -stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format) { +stream_t* open_stream_full(const char* filename,int mode, char** options, int* file_format) { int i,j,l,r; const stream_info_t* sinfo; stream_t* s; @@ -250,7 +250,7 @@ return NULL; } -stream_t* open_output_stream(char* filename,char** options) { +stream_t* open_output_stream(const char* filename, char** options) { int file_format; //unused if(!filename) { mp_msg(MSGT_OPEN,MSGL_ERR,"open_output_stream(), NULL filename, report this bug\n"); diff -r 71c816ff3ab4 -r 9a49143918aa stream/stream.h --- a/stream/stream.h Thu Feb 25 22:44:02 2010 +0000 +++ b/stream/stream.h Thu Feb 25 22:47:04 2010 +0000 @@ -339,9 +339,9 @@ stream_t* new_stream(int fd,int type); void free_stream(stream_t *s); stream_t* new_memory_stream(unsigned char* data,int len); -stream_t* open_stream(char* filename,char** options,int* file_format); -stream_t* open_stream_full(char* filename,int mode, char** options, int* file_format); -stream_t* open_output_stream(char* filename,char** options); +stream_t* open_stream(const char* filename,char** options,int* file_format); +stream_t* open_stream_full(const char* filename,int mode, char** options, int* file_format); +stream_t* open_output_stream(const char* filename,char** options); /// Set the callback to be used by libstream to check for user /// interruption during long blocking operations (cache filling, etc). void stream_set_interrupt_callback(int (*cb)(int));