libwww/Library/src/HTMerge.c - diff

Return to HTMerge.c CVS log

Up to [Public] / libwww / Library / src

Diff for /libwww/Library/src/HTMerge.c between versions 2.2 and 2.3

version 2.2, 1998/05/04 19:36:59	version 2.3, 1999/02/22 22:10:11
Line 56 PRIVATE int HTMerge_flush (HTStream * me	Line 56 PRIVATE int HTMerge_flush (HTStream * me
PRIVATE int HTMerge_free (HTStream * me)	PRIVATE int HTMerge_free (HTStream * me)
{	{
if (me) {	if (me) {
if (STREAM_TRACE)	HTTRACE(STREAM_TRACE, "Merge Free.. Called with %d feeds\n" _ me->feeds);
HTTrace("Merge Free.. Called with %d feeds\n", me->feeds);
if (--me->feeds <= 0) {	if (--me->feeds <= 0) {
(*me->target->isa->_free)(me->target);	(*me->target->isa->_free)(me->target);
HT_FREE(me);	HT_FREE(me);
Line 70 PRIVATE int HTMerge_free (HTStream * me)	Line 69 PRIVATE int HTMerge_free (HTStream * me)
PRIVATE int HTMerge_abort (HTStream * me, HTList * e)	PRIVATE int HTMerge_abort (HTStream * me, HTList * e)
{	{
if (me) {	if (me) {
if (STREAM_TRACE)	HTTRACE(STREAM_TRACE, "Merge Abort. Called with %d feeds\n" _ me->feeds);
HTTrace("Merge Abort. Called with %d feeds\n", me->feeds);
if (--me->feeds <= 0) {	if (--me->feeds <= 0) {
(*me->target->isa->abort)(me->target, e);	(*me->target->isa->abort)(me->target, e);
HT_FREE(me);	HT_FREE(me);
Line 99 PUBLIC HTStream * HTMerge (HTStream * ta	Line 97 PUBLIC HTStream * HTMerge (HTStream * ta
me->isa = &HTMergeClass;	me->isa = &HTMergeClass;
me->target = target ? target : HTBlackHole();	me->target = target ? target : HTBlackHole();
me->feeds = feeds >= 1 ? feeds : 1; /* Min 1 feed */	me->feeds = feeds >= 1 ? feeds : 1; /* Min 1 feed */
if (STREAM_TRACE) HTTrace("Merge....... Created stream %p\n", me);	HTTRACE(STREAM_TRACE, "Merge....... Created stream %p\n" _ me);
return me;	return me;
}	}

Webmaster

Removed from v.2.2
changed lines
	Added in v.2.3