plugin/access/http.c: cosmetic fixes in an error message

  src/input/*: removed some testcode and some unnecessary debug messages
parent f1686300
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in * http.c: HTTP access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.17 2002/07/24 18:31:24 sigmunau Exp $ * $Id: http.c,v 1.18 2002/07/25 21:53:53 sigmunau Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -206,7 +206,7 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell ) ...@@ -206,7 +206,7 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
} }
else else
{ {
msg_Err( p_input, "http error: invalid http reply" ); msg_Err( p_input, "invalid http reply" );
return -1; return -1;
} }
...@@ -216,6 +216,7 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell ) ...@@ -216,6 +216,7 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
psz_return_alpha ); psz_return_alpha );
return -1; return -1;
} }
for( ; ; ) for( ; ; )
{ {
if( input_Peek( p_input, &psz_parser, MAX_LINE ) <= 0 ) if( input_Peek( p_input, &psz_parser, MAX_LINE ) <= 0 )
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input.c,v 1.207 2002/07/24 23:11:55 massiot Exp $ * $Id: input.c,v 1.208 2002/07/25 21:53:53 sigmunau Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -159,13 +159,6 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, ...@@ -159,13 +159,6 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
p_input->stream.p_info->p_info = NULL; p_input->stream.p_info->p_info = NULL;
p_input->stream.p_info->p_next = NULL; p_input->stream.p_info->p_next = NULL;
/* test code */
msg_Dbg( p_input, "finding category \"hepp\"");
p_info = input_InfoCategory( p_input, "hepp" );
msg_Dbg( p_input, "adding testkey/testval");
input_AddInfo( p_info, "testkey", "testval");
/* end test code */
msg_Info( p_input, "playlist item `%s'", p_input->psz_source ); msg_Info( p_input, "playlist item `%s'", p_input->psz_source );
p_info = input_InfoCategory( p_input, "General"); p_info = input_InfoCategory( p_input, "General");
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_info.c: Convenient functions to handle the input info structures * input_info.c: Convenient functions to handle the input info structures
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_info.c,v 1.3 2002/07/23 00:30:22 sam Exp $ * $Id: input_info.c,v 1.4 2002/07/25 21:53:53 sigmunau Exp $
* *
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
* *
...@@ -41,7 +41,6 @@ input_info_category_t * input_InfoCategory( input_thread_t * p_this, ...@@ -41,7 +41,6 @@ input_info_category_t * input_InfoCategory( input_thread_t * p_this,
{ {
input_info_category_t * p_category, * p_prev; input_info_category_t * p_category, * p_prev;
p_prev = NULL; p_prev = NULL;
msg_Dbg( p_this, "searching for category");
for ( p_category = p_this->stream.p_info; for ( p_category = p_this->stream.p_info;
(p_category != NULL) && strcmp( p_category->psz_name, psz_name ); (p_category != NULL) && strcmp( p_category->psz_name, psz_name );
p_category = p_category->p_next) p_category = p_category->p_next)
...@@ -50,13 +49,10 @@ input_info_category_t * input_InfoCategory( input_thread_t * p_this, ...@@ -50,13 +49,10 @@ input_info_category_t * input_InfoCategory( input_thread_t * p_this,
} }
if ( p_category ) if ( p_category )
{ {
msg_Dbg(p_this, "found category at %p, with name %s", p_category
,p_category->psz_name);
return p_category; return p_category;
} }
else else
{ {
msg_Dbg( p_this, "creating new input category");
p_category = malloc( sizeof( input_info_category_t ) ); p_category = malloc( sizeof( input_info_category_t ) );
if ( !p_category ) if ( !p_category )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment