Update of /cvsroot/xine/xine-plugin/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11469
Modified Files:
playlist.c
Log Message:
Avoid conflicting functions names (getline()).
Index: playlist.c
===================================================================
RCS file: /cvsroot/xine/xine-plugin/src/playlist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- playlist.c 30 Oct 2006 16:45:36 -0000 1.4
+++ playlist.c 23 Nov 2006 16:36:14 -0000 1.5
@@ -47,14 +47,14 @@
return s;
}
-static char *getline (FILE *fp, char *buf, int size) {
+static char *get_line (FILE *fp, char *buf, int size) {
if (fgets (buf, size, fp) == NULL)
return NULL;
return trim (buf);
}
-static char *gettag (FILE *fp, char *buf, int size) {
+static char *get_tag (FILE *fp, char *buf, int size) {
int c, i = 0;
do {
@@ -77,7 +77,7 @@
return buf;
}
-static char *getprop (char *tag, const char *prop, const int prop_len) {
+static char *get_prop (char *tag, const char *prop, const int prop_len) {
char *p, *e;
while ((p = strstr (tag, prop))) {
@@ -109,7 +109,7 @@
char *line;
int num = 0;
- while ((line = getline (fp, buf, sizeof(buf)))) {
+ while ((line = get_line (fp, buf, sizeof(buf)))) {
if (*line == '\0' || *line == '#')
continue;
if (playlist_insert (list, line))
@@ -124,7 +124,7 @@
char *line, *tmp;
int num = 0;
- while ((line = getline (fp, buf, sizeof(buf)))) {
+ while ((line = get_line (fp, buf, sizeof(buf)))) {
if (*line == '\0' || *line == '#')
continue;
if (!strncmp (line, "--stop--", 8))
@@ -145,7 +145,7 @@
char *line;
int num = 0;
- while ((line = getline (fp, buf, sizeof(buf)))) {
+ while ((line = get_line (fp, buf, sizeof(buf)))) {
if (!strncmp (line, "File", 4)) {
line = strchr (line+4, '=');
if (line && *(line+1)) {
@@ -163,11 +163,11 @@
char *tag, *src;
int num = 0;
- while ((tag = gettag (fp, buf, sizeof(buf)))) {
+ while ((tag = get_tag (fp, buf, sizeof(buf)))) {
if (!strncasecmp (tag, "ref ", 4)) {
- src = getprop (tag + 4, "href", 4);
+ src = get_prop (tag + 4, "href", 4);
if (!src)
- src = getprop (tag + 4, "HREF", 4);
+ src = get_prop (tag + 4, "HREF", 4);
if (src && *src) {
if (playlist_insert (list, src))
num++;
@@ -183,11 +183,11 @@
char *tag, *src;
int num = 0;
- while ((tag = gettag (fp, buf, sizeof(buf)))) {
+ while ((tag = get_tag (fp, buf, sizeof(buf)))) {
if (!strncasecmp (tag, "audio ", 6) || !strncasecmp (tag, "video ", 6)) {
- src = getprop (tag + 6, "src", 3);
+ src = get_prop (tag + 6, "src", 3);
if (!src)
- src = getprop (tag + 6, "SRC", 3);
+ src = get_prop (tag + 6, "SRC", 3);
if (src && *src) {
if (playlist_insert (list, src))
num++;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
