diff options
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/dvd_udf.c | 25 | ||||
| -rw-r--r-- | src/input/input_file.c | 13 |
2 files changed, 16 insertions, 22 deletions
diff --git a/src/input/dvd_udf.c b/src/input/dvd_udf.c index 6a3d839c5..e86012ff7 100644 --- a/src/input/dvd_udf.c +++ b/src/input/dvd_udf.c @@ -31,10 +31,7 @@ #include <fcntl.h> #include "dvd_udf.h" - -#ifndef __GNUC__ -#define __FUNCTION__ __func__ -#endif +#include "compat.h" static int _Unicodedecode (uint8_t *data, int len, char *target); @@ -288,7 +285,7 @@ int UDFMapICB (int fd, const struct AD *ICB, uint8_t *FileType, struct AD *File) uint16_t TagID; if ((LogBlock = (uint8_t*)malloc(DVD_VIDEO_LB_LEN)) == NULL) { - fprintf(stderr, "%s: malloc failed\n", __FUNCTION__); + fprintf(stderr, "%s: malloc failed\n", __XINE_FUNCTION__); return 0; } @@ -327,13 +324,13 @@ int UDFScanDir (int fd, const struct AD *Dir, char *FileName, struct AD *FileICB LogBlock = (uint8_t*)malloc(DVD_VIDEO_LB_LEN * 30); if ( !LogBlock ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, DVD_VIDEO_LB_LEN * 30); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, DVD_VIDEO_LB_LEN * 30); goto error_0; } filename = (char*)malloc(MAX_FILE_LEN); if ( !filename ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, MAX_FILE_LEN); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, MAX_FILE_LEN); goto error_1; } @@ -399,13 +396,13 @@ int UDFFindPartition (int fd, int partnum, struct Partition *part) Anchor = (uint8_t*)malloc(DVD_VIDEO_LB_LEN); if ( !Anchor ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, DVD_VIDEO_LB_LEN); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, DVD_VIDEO_LB_LEN); goto error_0; } LogBlock = (uint8_t*)malloc(DVD_VIDEO_LB_LEN); if ( !LogBlock ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, DVD_VIDEO_LB_LEN); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, DVD_VIDEO_LB_LEN); goto error_1; } @@ -496,13 +493,13 @@ off_t UDFFindFile (int fd, char *filename, off_t *size) tokenline = (char*)malloc(MAX_FILE_LEN); if ( !tokenline ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, MAX_FILE_LEN); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, MAX_FILE_LEN); goto error_0; } LogBlock = (uint8_t*)malloc(DVD_VIDEO_LB_LEN); if ( !LogBlock ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, DVD_VIDEO_LB_LEN); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, DVD_VIDEO_LB_LEN); goto error_1; } @@ -584,21 +581,21 @@ void UDFListDir(int fd, char *dirname, int nMaxFiles, char **file_list, int *nFi filename = (char*)malloc(MAX_FILE_LEN); if ( !filename ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, MAX_FILE_LEN); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, MAX_FILE_LEN); goto error_0; } tokenline = (char*)malloc(MAX_FILE_LEN); if ( !tokenline ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, MAX_FILE_LEN); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, MAX_FILE_LEN); goto error_1; } LogBlock = (uint8_t*)malloc(DVD_VIDEO_LB_LEN * 30); if ( !LogBlock ) { - fprintf(stderr, MALLOC_FAILED, __FUNCTION__, DVD_VIDEO_LB_LEN*30); + fprintf(stderr, MALLOC_FAILED, __XINE_FUNCTION__, DVD_VIDEO_LB_LEN*30); goto error_2; } diff --git a/src/input/input_file.c b/src/input/input_file.c index ae7267a2b..771108769 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_file.c,v 1.29 2001/11/18 03:53:23 guenter Exp $ + * $Id: input_file.c,v 1.30 2001/11/30 00:53:51 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -37,14 +37,11 @@ #include "xine_internal.h" #include "xineutils.h" +#include "compat.h" #include "input_plugin.h" extern int errno; -#ifndef __GNUC__ -#define __FUNCTION__ __func__ -#endif - #define MAXFILES 65535 #ifndef NAME_MAX @@ -456,7 +453,7 @@ static mrl_t **file_plugin_get_dir (input_plugin_t *this_gen, if(linksize < 0) { fprintf(stderr, "%s(%d): readlink() failed: %s\n", - __FUNCTION__, __LINE__, strerror(errno)); + __XINE_FUNCTION__, __LINE__, strerror(errno)); } else { dir_files[num_dir_files].link = (char *) xine_xmalloc(linksize + 1); @@ -490,7 +487,7 @@ static mrl_t **file_plugin_get_dir (input_plugin_t *this_gen, if(linksize < 0) { fprintf(stderr, "%s(%d): readlink() failed: %s\n", - __FUNCTION__, __LINE__, strerror(errno)); + __XINE_FUNCTION__, __LINE__, strerror(errno)); } else { hide_files[num_hide_files].link = (char *) @@ -524,7 +521,7 @@ static mrl_t **file_plugin_get_dir (input_plugin_t *this_gen, if(linksize < 0) { fprintf(stderr, "%s(%d): readlink() failed: %s\n", - __FUNCTION__, __LINE__, strerror(errno)); + __XINE_FUNCTION__, __LINE__, strerror(errno)); } else { norm_files[num_norm_files].link = (char *) |