summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/http_helper.c34
-rw-r--r--src/input/input_http.c4
-rw-r--r--src/input/input_v4l.c2
-rw-r--r--src/input/libdvdnav/Makefile.am2
-rw-r--r--src/input/libdvdnav/dvd_reader.c9
-rw-r--r--src/input/libdvdnav/dvdnav_internal.h7
-rw-r--r--src/input/vcd/libcdio/Makefile.am2
-rw-r--r--src/input/vcd/libvcd/Makefile.am2
8 files changed, 30 insertions, 32 deletions
diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index f58b6c8f4..f962766e4 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -19,20 +19,18 @@
*
* URL helper functions
*
- * $Id: http_helper.c,v 1.2 2004/03/03 20:09:12 mroi Exp $
+ * $Id: http_helper.c,v 1.3 2004/09/20 19:30:04 valtri Exp $
*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
#include "xine_internal.h"
#include "http_helper.h"
-static char *_strndup(const char *s, size_t n) {
- char *ret;
-
- ret = malloc (n + 1);
- strncpy(ret, s, n);
- ret[n] = '\0';
- return ret;
-}
-
int _x_parse_url (char *url, char **proto, char** host, int *port,
char **user, char **password, char **uri) {
char *start = NULL;
@@ -64,7 +62,7 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
if (!start || (start == url))
goto error;
- *proto = _strndup(url, start - url);
+ *proto = strndup(url, start - url);
/* user:password */
start += 3;
@@ -77,12 +75,12 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
if (at) {
authcolon = strchr(start, ':');
if(authcolon && authcolon < at) {
- *user = _strndup(start, authcolon - start);
- *password = _strndup(authcolon + 1, at - authcolon - 1);
+ *user = strndup(start, authcolon - start);
+ *password = strndup(authcolon + 1, at - authcolon - 1);
if ((authcolon == start) || (at == (authcolon + 1))) goto error;
} else {
/* no password */
- *user = _strndup(start, at - start);
+ *user = strndup(start, at - start);
if (at == start) goto error;
}
start = at + 1;
@@ -96,18 +94,18 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
portcolon = strchr(start, ':');
if (slash) {
if (portcolon && portcolon < slash) {
- *host = _strndup(start, portcolon - start);
+ *host = strndup(start, portcolon - start);
if (portcolon == start) goto error;
*port = strtol(portcolon + 1, &strtol_err, 10);
if ((strtol_err != slash) || (strtol_err == portcolon + 1))
goto error;
} else {
- *host = _strndup(start, slash - start);
+ *host = strndup(start, slash - start);
if (slash == start) goto error;
}
} else {
if (portcolon) {
- *host = _strndup(start, portcolon - start);
+ *host = strndup(start, portcolon - start);
if (portcolon < end) {
*port = strtol(portcolon + 1, &strtol_err, 10);
if (*strtol_err != '\0') goto error;
@@ -126,7 +124,7 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
hostendbracket = strchr(start, ']');
if (hostendbracket != NULL) {
if (hostendbracket == start + 1) goto error;
- *host = _strndup(start + 1, hostendbracket - start - 1);
+ *host = strndup(start + 1, hostendbracket - start - 1);
if (hostendbracket < end) {
/* Might have a trailing port */
diff --git a/src/input/input_http.c b/src/input/input_http.c
index da78175c0..303ef4510 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
*
* input plugin for http network streams
*
- * $Id: input_http.c,v 1.97 2004/09/18 20:50:09 zonque Exp $
+ * $Id: input_http.c,v 1.98 2004/09/20 19:30:04 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -172,7 +172,7 @@ static int _x_use_proxy(http_input_class_t *this, const char *host) {
if ((info = gethostbyname(host)) == NULL) {
xine_log(this->xine, XINE_LOG_MSG,
_("input_http: gethostbyname(%s) failed: %s\n"), host,
- xine_hstrerror(h_errno));
+ hstrerror(h_errno));
return 1;
}
if (!info->h_name) return 1;
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index dcc797fde..b1d42bd82 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -25,8 +25,6 @@
#include "config.h"
#endif
-#define _GNU_SOURCE
-
#include <unistd.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am
index f48c7a3f9..07b29091f 100644
--- a/src/input/libdvdnav/Makefile.am
+++ b/src/input/libdvdnav/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -DDVDNAV_COMPILE
+AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -DDVDNAV_COMPILE -DHAVE_DLFCN_H
noinst_LTLIBRARIES = libdvdnav.la
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 185143604..964d97f76 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -1,7 +1,7 @@
/*
- * Copyright (C) 2001, 2002, 2003 Billy Biggs <vektor@dumbterm.net>,
- * Håkan Hjort <d95hjort@dtek.chalmers.se>,
- * Björn Englund <d4bjorn@dtek.chalmers.se>
+ * Copyright (C) 2001-2004 Billy Biggs <vektor@dumbterm.net>,
+ * Håkan Hjort <d95hjort@dtek.chalmers.se>,
+ * Björn Englund <d4bjorn@dtek.chalmers.se>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
#ifdef WIN32
/* replacement gettimeofday implementation */
#include <sys/timeb.h>
-static inline int gettimeofday( struct timeval *tv, void *tz )
+static inline int _private_gettimeofday( struct timeval *tv, void *tz )
{
struct timeb t;
ftime( &t );
@@ -44,6 +44,7 @@ static inline int gettimeofday( struct timeval *tv, void *tz )
tv->tv_usec = t.millitm * 1000;
return 0;
}
+#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
#include <io.h> /* read() */
#define lseek64 _lseeki64
#endif
diff --git a/src/input/libdvdnav/dvdnav_internal.h b/src/input/libdvdnav/dvdnav_internal.h
index 29733ed54..35d9f3470 100644
--- a/src/input/libdvdnav/dvdnav_internal.h
+++ b/src/input/libdvdnav/dvdnav_internal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
+ * Copyright (C) 2001-2004 Rich Wareham <richwareham@users.sourceforge.net>
*
* This file is part of libdvdnav, a DVD navigation library.
*
@@ -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: dvdnav_internal.h,v 1.14 2004/03/16 11:43:38 mroi Exp $
+ * $Id: dvdnav_internal.h,v 1.15 2004/09/20 19:30:04 valtri Exp $
*
*/
@@ -47,7 +47,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
/* replacement gettimeofday implementation */
#include <sys/timeb.h>
-static inline int gettimeofday( struct timeval *tv, void *tz )
+static inline int _private_gettimeofday( struct timeval *tv, void *tz )
{
struct timeb t;
ftime( &t );
@@ -55,6 +55,7 @@ static inline int gettimeofday( struct timeval *tv, void *tz )
tv->tv_usec = t.millitm * 1000;
return 0;
}
+#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
#include <io.h> /* read() */
#define lseek64 _lseeki64
diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am
index 799d4585f..134397e30 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/src/input/vcd/libcdio/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
SUBDIRS = cdio MSWindows image
-INCLUDES = $(LIBCDIO_CFLAGS)
+INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
libcdio_SRCS = \
image/bincue.c \
diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am
index edd3d0e28..01b100aa4 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/src/input/vcd/libvcd/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
SUBDIRS = libvcd
-INCLUDES = $(LIBCDIO_CFLAGS)
+INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
libvcd_SRCS = \
vcd.c \
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 20:26:11 +0000