rpl/src/instructions_f3.c - diff

Return to instructions_f3.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_f3.c between versions 1.21 and 1.25.2.2

version 1.21, 2010/09/23 15:27:38	version 1.25.2.2, 2011/04/14 08:46:42
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.20	RPL/2 (R) version 4.0.23
Copyright (C) 1989-2010 Dr. BERTRAND Joël	Copyright (C) 1989-2011 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 148 instruction_format(struct_processus *s_e	Line 148 instruction_format(struct_processus *s_e
if (((*s_objet_argument_1).type == FCH) &&	if (((*s_objet_argument_1).type == FCH) &&
((*s_objet_argument_2).type == LST))	((*s_objet_argument_2).type == LST))
{	{
	if ((((struct_fichier ) (*s_objet_argument_1).objet)).binaire
	== 'F')
	{
	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);

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

if ((s_copie_argument_1 = copie_objet(s_etat_processus,	if ((s_copie_argument_1 = copie_objet(s_etat_processus,
s_objet_argument_1, 'N')) == NULL)	s_objet_argument_1, 'N')) == NULL)
{	{
Line 167 instruction_format(struct_processus *s_e	Line 178 instruction_format(struct_processus *s_e
else if (((*s_objet_argument_1).type == SCK) &&	else if (((*s_objet_argument_1).type == SCK) &&
((*s_objet_argument_2).type == LST))	((*s_objet_argument_2).type == LST))
{	{
	if ((((struct_socket ) (*s_objet_argument_1).objet)).binaire
	== 'F')
	{
	liberation(s_etat_processus, s_objet_argument_1);
	liberation(s_etat_processus, s_objet_argument_2);

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

if ((s_copie_argument_1 = copie_objet(s_etat_processus,	if ((s_copie_argument_1 = copie_objet(s_etat_processus,
s_objet_argument_1, 'N')) == NULL)	s_objet_argument_1, 'N')) == NULL)
{	{
Line 1816 instruction_fuse(struct_processus *s_eta	Line 1838 instruction_fuse(struct_processus *s_eta
}	}

# ifndef OS2	# ifndef OS2
	# ifndef Cygwin
if (pthread_attr_setschedpolicy(&attributs, SCHED_OTHER) != 0)	if (pthread_attr_setschedpolicy(&attributs, SCHED_OTHER) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 1835 instruction_fuse(struct_processus *s_eta	Line 1858 instruction_fuse(struct_processus *s_eta
return;	return;
}	}
# endif	# endif
	# endif

if (pthread_create(&(*s_etat_processus).thread_fusible, &attributs,	if (pthread_create(&(*s_etat_processus).thread_fusible, &attributs,
fusible, s_etat_processus) != 0)	fusible, s_etat_processus) != 0)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.21
changed lines
	Added in v.1.25.2.2