rpl/src/rpl.c - diff

Return to rpl.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/rpl.c between versions 1.135 and 1.138

version 1.135, 2013/02/27 17:11:45	version 1.138, 2013/03/26 09:04:33
Line 51 rplinit(int argc, char argv[], char en	Line 51 rplinit(int argc, char argv[], char en
int erreur_historique;	int erreur_historique;
int option_P;	int option_P;

	integer8 i;

logical1 core;	logical1 core;
logical1 debug;	logical1 debug;
logical1 erreur_fichier;	logical1 erreur_fichier;
Line 106 rplinit(int argc, char argv[], char en	Line 108 rplinit(int argc, char argv[], char en
unsigned char *ptr;	unsigned char *ptr;
unsigned char *tampon;	unsigned char *tampon;

unsigned long i;
unsigned long unite_fichier;	unsigned long unite_fichier;

void *l_element_courant;	void *l_element_courant;
Line 219 rplinit(int argc, char argv[], char en	Line 220 rplinit(int argc, char argv[], char en
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

if ((arg_exec = malloc((argc + 1) * sizeof(char *))) == NULL)	if ((arg_exec = malloc((((size_t) argc) + 1) * sizeof(char *))) == NULL)
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_post(&semaphore_gestionnaires_signaux);	sem_post(&semaphore_gestionnaires_signaux);
Line 241 rplinit(int argc, char argv[], char en	Line 242 rplinit(int argc, char argv[], char en
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

for(i = 0; i < (unsigned long) argc; i++)	for(i = 0; i < argc; i++)
{	{
arg_exec[i] = argv[i];	arg_exec[i] = argv[i];
}	}
Line 2253 rplinit(int argc, char argv[], char en	Line 2254 rplinit(int argc, char argv[], char en
}	}

(*s_etat_processus).longueur_definitions_chainees =	(*s_etat_processus).longueur_definitions_chainees =
strlen((*s_etat_processus)	(integer8) strlen((*s_etat_processus)
.definitions_chainees);	.definitions_chainees);

break;	break;
Line 4482 rplinit(int argc, char argv[], char en	Line 4483 rplinit(int argc, char argv[], char en
{	{
(*s_etat_processus).erreur_systeme = d_es;	(*s_etat_processus).erreur_systeme = d_es;
encart(s_etat_processus,	encart(s_etat_processus,
(unsigned long) (5 * 1000000));	(integer8) (5 * 1000000));

if ((*s_etat_processus).erreur_systeme != d_es)	if ((*s_etat_processus).erreur_systeme != d_es)
{	{
Line 5138 rplinit(int argc, char argv[], char en	Line 5139 rplinit(int argc, char argv[], char en

if (erreur == d_absence_erreur)	if (erreur == d_absence_erreur)
{	{
if (((*s_etat_processus).var_volatile_alarme	if (((*s_etat_processus)
== 0) && ((*s_etat_processus)
.arret_depuis_abort == 0) &&	.arret_depuis_abort == 0) &&
((*s_etat_processus).at_exit	((*s_etat_processus).at_exit
!= NULL))	!= NULL))
{	{
	// Permet de traiter ATEXIT
	// m�me apr�s r�ception d'un SIGINT.
	(*s_etat_processus)
	.var_volatile_alarme = 0;
	(*s_etat_processus)
	.var_volatile_requete_arret = 0;

erreur = evaluation(s_etat_processus,	erreur = evaluation(s_etat_processus,
(*s_etat_processus).at_exit,	(*s_etat_processus).at_exit,
'E');	'E');
Line 5159 rplinit(int argc, char argv[], char en	Line 5166 rplinit(int argc, char argv[], char en

if (erreur == d_absence_erreur)	if (erreur == d_absence_erreur)
{	{
if (((*s_etat_processus).var_volatile_alarme	if (((*s_etat_processus)
== 0) && ((*s_etat_processus)
.arret_depuis_abort == 0) &&	.arret_depuis_abort == 0) &&
((*s_etat_processus).at_exit	((*s_etat_processus).at_exit
!= NULL))	!= NULL))
{	{
	// Permet de traiter ATEXIT
	// m�me apr�s r�ception d'un SIGINT.
	(*s_etat_processus)
	.var_volatile_alarme = 0;
	(*s_etat_processus)
	.var_volatile_requete_arret = 0;

erreur = evaluation(s_etat_processus,	erreur = evaluation(s_etat_processus,
(*s_etat_processus).at_exit,	(*s_etat_processus).at_exit,
'E');	'E');
Line 5380 rplinit(int argc, char argv[], char en	Line 5393 rplinit(int argc, char argv[], char en
l_element_courant = (void *)	l_element_courant = (void *)
(*s_etat_processus).l_base_pile_processus;	(*s_etat_processus).l_base_pile_processus;

for(i = 0; i < (unsigned long)	for(i = 0; i < ((((struct_processus_fils *)
((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee).objet)).thread)	l_element_courant)).donnee).objet)).thread)
.nombre_objets_dans_pipe; i++)	.nombre_objets_dans_pipe; i++)
Line 5721 rplinit(int argc, char argv[], char en	Line 5733 rplinit(int argc, char argv[], char en
{	{
free((*resultats));	free((*resultats));

if (((resultats) = malloc(((s_etat_processus)	if (((*resultats) = malloc(((size_t)
.hauteur_pile_operationnelle + 1)	((*s_etat_processus)
	.hauteur_pile_operationnelle + 1))
* sizeof(unsigned char **))) != NULL)	* sizeof(unsigned char **))) != NULL)
{	{
(resultats)[(s_etat_processus)	(resultats)[(s_etat_processus)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.135
changed lines
	Added in v.1.138