Diff: dr_47.c - dr

	dr_47.c	dr_47.c
	/************************************************************************ *	/************************************************************************ *
	* dr_47.c	* dr_47.c

	* Copyright (C) 2001-2010 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: dr_47.c,v 1.1 2002/12/11 13:14:42 jobi Exp $	* $Id: dr_47.c,v 1.1 2002/12/11 13:14:42 jobi Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* Johan Bilien <jobi@via.ecp.fr>	* Johan Bilien <jobi@via.ecp.fr>
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	skipping to change at line 29	skipping to change at line 29
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1 USA	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	#include "config.h"	#include "config.h"

	#include <stdio.h>	#include <stdio.h>
	#include <stdlib.h>	#include <stdlib.h>

		#include <stdbool.h>
	#include <string.h>	#include <string.h>

	#if defined(HAVE_INTTYPES_H)	#if defined(HAVE_INTTYPES_H)
	#include <inttypes.h>	#include <inttypes.h>
	#elif defined(HAVE_STDINT_H)	#elif defined(HAVE_STDINT_H)
	#include <stdint.h>	#include <stdint.h>
	#endif	#endif

	#include "../dvbpsi.h"	#include "../dvbpsi.h"
	#include "../dvbpsi_private.h"	#include "../dvbpsi_private.h"
	#include "../descriptor.h"	#include "../descriptor.h"

	#include "dr_47.h"	#include "dr_47.h"

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DecodeBouquetNameDr	* dvbpsi_DecodeBouquetNameDr
	************************************************************************ */	************************************************************************ */
	dvbpsi_bouquet_name_dr_t * dvbpsi_DecodeBouquetNameDr(	dvbpsi_bouquet_name_dr_t * dvbpsi_DecodeBouquetNameDr(
	dvbpsi_descriptor_t * p_descriptor)	dvbpsi_descriptor_t * p_descriptor)
	{	{

	dvbpsi_bouquet_name_dr_t * p_decoded;	dvbpsi_bouquet_name_dr_t * p_decoded;


	/* Check the tag */	/* Check the tag */
	if(p_descriptor->i_tag != 0x47)	if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x47))
	{	return NULL;
	DVBPSI_ERROR_ARG("dr_47 decoder", "bad tag (0x%x)", p_descriptor->i_tag
	);	/* Don't decode twice */
	return NULL;	if (dvbpsi_IsDescriptorDecoded(p_descriptor))
	}	return p_descriptor->p_decoded;

	/* Don't decode twice */	/* Allocate memory */
	if(p_descriptor->p_decoded)	p_decoded = (dvbpsi_bouquet_name_dr_t*)malloc(sizeof(dvbpsi_bouquet_nam
	return p_descriptor->p_decoded;	e_dr_t));
		if (!p_decoded)
	/* Allocate memory */	return NULL;
	p_decoded =
	(dvbpsi_bouquet_name_dr_t*)malloc(sizeof(dvbpsi_bouquet_name_dr_t))
	;
	if(!p_decoded)
	{
	DVBPSI_ERROR("dr_47 decoder", "out of memory");
	return NULL;
	}

	/* Decode data */
	p_decoded->i_name_length = p_descriptor->i_length;
	if(p_decoded->i_name_length)
	memcpy(p_decoded->i_char,
	p_descriptor->p_data,
	p_decoded->i_name_length);


	p_descriptor->p_decoded = (void*)p_decoded;	/* Decode data */
		p_decoded->i_name_length = p_descriptor->i_length;
		if(p_decoded->i_name_length)
		memcpy(p_decoded->i_char,
		p_descriptor->p_data,
		p_decoded->i_name_length);

		p_descriptor->p_decoded = (void*)p_decoded;


	return p_decoded;	return p_decoded;
	}	}

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenBouquetNameDr	* dvbpsi_GenBouquetNameDr
	************************************************************************ */	************************************************************************ */

	dvbpsi_descriptor_t * dvbpsi_GenBouquetNameDr(	dvbpsi_descriptor_t * dvbpsi_GenBouquetNameDr(dvbpsi_bouquet_name_dr_t *p_d
	dvbpsi_bouquet_name_dr_t * p_decode	ecoded,
	d,	bool b_duplicate)
	int b_duplicate)
	{	{

	/* Create the descriptor */	/* Create the descriptor */
	dvbpsi_descriptor_t * p_descriptor =	dvbpsi_descriptor_t * p_descriptor =
	dvbpsi_NewDescriptor(0x47, p_decoded->i_name_length, NULL);	dvbpsi_NewDescriptor(0x47, p_decoded->i_name_length, NULL);
		if (!p_descriptor)
		return NULL;


	if(p_descriptor)
	{
	/* Encode data */	/* Encode data */
	if(p_decoded->i_name_length)	if(p_decoded->i_name_length)

	memcpy(p_descriptor->p_data,	memcpy(p_descriptor->p_data,
	p_decoded->i_char,	p_decoded->i_char,
	p_decoded->i_name_length);	p_decoded->i_name_length);


	if(b_duplicate)	if (b_duplicate)
	{	{

	/* Duplicate decoded data */	/* Duplicate decoded data */
	dvbpsi_bouquet_name_dr_t * p_dup_decoded =	p_descriptor->p_decoded =
	(dvbpsi_bouquet_name_dr_t*)malloc(sizeof(dvbpsi_bouquet_name_dr_t))	dvbpsi_DuplicateDecodedDescriptor(p_decoded,
	;	sizeof(dvbpsi_bouquet_nam
	if(p_dup_decoded)	e_dr_t));
	memcpy(p_dup_decoded, p_decoded, sizeof(dvbpsi_bouquet_name_dr_t));

	p_descriptor->p_decoded = (void*)p_dup_decoded;
	}	}

	}


	return p_descriptor;	return p_descriptor;
	}	}

End of changes. 14 change blocks.
	55 lines changed or deleted	43 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/