Mercurial > mplayer.hg

diff stream/stream_cddb.c @ 25779:ad419ff363d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify and keep terminating end-of-line
author reimar
date Sat, 19 Jan 2008 16:57:53 +0000
parents 15c5da485a77
children 8c53d40799e1
line wrap: on
line diff
--- a/stream/stream_cddb.c	Sat Jan 19 16:49:01 2008 +0000
+++ b/stream/stream_cddb.c	Sat Jan 19 16:57:53 2008 +0000
@@ -442,13 +442,13 @@
 			ptr = strdup(ptr);
 			// Ok found the beginning of the file
 			// look for the end
-			ptr2 = strstr(ptr, "\r\n.\r\n");
-			if( ptr2==NULL ) {
+			ptr2 = strstr(ptr, "\n.\r\n");
+			if (!ptr2)
 				ptr2 = strstr(ptr, "\n.\n");
-				if( ptr2==NULL ) {
+			if (ptr2) ptr2++;
+			else {
 					mp_msg(MSGT_DEMUX, MSGL_FIXME, "Unable to find '.'\n");
 					ptr2=ptr+strlen(ptr); //return -1;
-				}
 			}
 			// Ok found the end
 			// do a sanity check