diff options
Diffstat (limited to 'libmpdemux/url.c')
-rw-r--r-- | libmpdemux/url.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libmpdemux/url.c b/libmpdemux/url.c index 7bcef82d84..0956a48490 100644 --- a/libmpdemux/url.c +++ b/libmpdemux/url.c @@ -12,6 +12,7 @@ #include "url.h" #include "mp_msg.h" +#include "help_mp.h" URL_t* url_new(const char* url) { @@ -27,19 +28,19 @@ url_new(const char* url) { // Create temp filename space unescfilename=malloc(strlen(url)+1); if (!unescfilename ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } escfilename=malloc(strlen(url)*3+1); if (!escfilename ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } // Create the URL container Curl = (URL_t*)malloc(sizeof(URL_t)); if( Curl==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } @@ -56,7 +57,7 @@ url_new(const char* url) { // Copy the url in the URL container Curl->url = strdup(escfilename); if( Curl->url==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } mp_msg(MSGT_OPEN,MSGL_V,"Filename for url is now %s\n",escfilename); @@ -76,7 +77,7 @@ url_new(const char* url) { pos1 = ptr1-escfilename; Curl->protocol = (char*)malloc(pos1+1); if( Curl->protocol==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strncpy(Curl->protocol, escfilename, pos1); @@ -98,7 +99,7 @@ url_new(const char* url) { int len = ptr2-ptr1; Curl->username = (char*)malloc(len+1); if( Curl->username==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strncpy(Curl->username, ptr1, len); @@ -111,7 +112,7 @@ url_new(const char* url) { Curl->username[ptr3-ptr1]='\0'; Curl->password = (char*)malloc(len2+1); if( Curl->password==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strncpy( Curl->password, ptr3+1, len2); @@ -163,7 +164,7 @@ url_new(const char* url) { // copy the hostname in the URL container Curl->hostname = (char*)malloc(pos2-pos1+1); if( Curl->hostname==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strncpy(Curl->hostname, ptr1, pos2-pos1); @@ -178,7 +179,7 @@ url_new(const char* url) { // copy the path/filename in the URL container Curl->file = strdup(ptr2); if( Curl->file==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } } @@ -187,7 +188,7 @@ url_new(const char* url) { if( Curl->file==NULL ) { Curl->file = (char*)malloc(2); if( Curl->file==NULL ) { - mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + mp_msg(MSGT_NETWORK,MSGL_FATAL,MSGTR_MPDEMUX_URL_MallocFailed); goto err_out; } strcpy(Curl->file, "/"); @@ -273,7 +274,7 @@ url_escape_string(char *outbuf, const char *inbuf) { *outbuf++=c; // already // dont escape again - mp_msg(MSGT_NETWORK,MSGL_ERR,"string appears to be already escaped in url_escape %c%c1%c2\n",c,c1,c2); + mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_URL_StringAlreadyEscaped,c,c1,c2); // error as this should not happen against RFC 2396 // to escape a string twice } else { |