rpl/src/instructions_s3.c - diff

Return to instructions_s3.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s3.c between versions 1.29 and 1.30

version 1.29, 2011/09/26 15:57:15	version 1.30, 2011/11/18 09:51:33
Line 47 instruction_sub(struct_processus *s_etat	Line 47 instruction_sub(struct_processus *s_etat
struct_objet *s_objet_argument_3;	struct_objet *s_objet_argument_3;
struct_objet *s_objet_resultat;	struct_objet *s_objet_resultat;

	unsigned char *ptr1;
	unsigned char *ptr2;

unsigned long i;	unsigned long i;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;
Line 144 instruction_sub(struct_processus *s_etat	Line 147 instruction_sub(struct_processus *s_etat
if ((*s_objet_argument_3).type == CHN)	if ((*s_objet_argument_3).type == CHN)
{	{
if ((((integer8 ) (*s_objet_argument_1).objet)) > (integer8)	if ((((integer8 ) (*s_objet_argument_1).objet)) > (integer8)
strlen((unsigned char ) (s_objet_argument_3).objet))	longueur_chaine(s_etat_processus,
	(unsigned char ) (s_objet_argument_3).objet))
{	{
liberation(s_etat_processus, s_objet_argument_1);	liberation(s_etat_processus, s_objet_argument_1);
liberation(s_etat_processus, s_objet_argument_2);	liberation(s_etat_processus, s_objet_argument_2);
Line 160 instruction_sub(struct_processus *s_etat	Line 164 instruction_sub(struct_processus *s_etat
return;	return;
}	}

if (((s_objet_resultat).objet = extraction_chaine((unsigned char )	if ((ptr1 = pointeur_ieme_caractere(s_etat_processus, (unsigned char *)
(s_objet_argument_3).objet, (((integer8 *)	(s_objet_argument_3).objet, (((integer8 *)
(s_objet_argument_2).objet)), (((integer8 *)	(*s_objet_argument_2).objet)) - 1)) == NULL)
(*s_objet_argument_1).objet)))) == NULL)	{
	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
	liberation(s_etat_processus, s_objet_argument_3);

	(*s_etat_processus).erreur_execution = d_ex_argument_invalide;
	return;
	}

	if ((ptr2 = pointeur_ieme_caractere(s_etat_processus, ptr1,
	(((integer8 ) (*s_objet_argument_1).objet))
	- ((((integer8 ) (*s_objet_argument_2).objet)) - 1))) == NULL)
	{
	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);
	liberation(s_etat_processus, s_objet_argument_3);

	(*s_etat_processus).erreur_execution = d_ex_argument_invalide;
	return;
	}

	if (((s_objet_resultat).objet = malloc(((ptr2 - ptr1) + 1)
	sizeof(unsigned char))) == NULL)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return;	return;
}	}

	strncpy((unsigned char ) (s_objet_resultat).objet, ptr1,
	ptr2 - ptr1)[ptr2 - ptr1] = d_code_fin_chaine;
}	}

/*	/*

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.29
changed lines
	Added in v.1.30