rpl/src/instructions_s8.c - diff

Return to instructions_s8.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s8.c between versions 1.53 and 1.57

version 1.53, 2012/12/20 15:32:52	version 1.57, 2013/03/21 11:30:30
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.12	RPL/2 (R) version 4.1.13
Copyright (C) 1989-2012 Dr. BERTRAND Joël	Copyright (C) 1989-2013 Dr. BERTRAND Joël

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

Line 102 instruction_splash(struct_processus *s_e	Line 102 instruction_splash(struct_processus *s_e
return;	return;
}	}

encart(s_etat_processus, (unsigned long) (attente * 1E6));	encart(s_etat_processus, (integer8) (attente * 1E6));
}	}
else	else
{	{
Line 1165 instruction_sqlquery(struct_processus *s	Line 1165 instruction_sqlquery(struct_processus *s
{	{
# ifdef POSTGRESQL_SUPPORT	# ifdef POSTGRESQL_SUPPORT

unsigned int i;	int i;
unsigned int j;	int j;
unsigned int nombre_colonnes;	int nombre_colonnes;
unsigned int nombre_lignes;	int nombre_lignes;

logical1 presence_resultat;	logical1 presence_resultat;

Line 1343 instruction_sqlquery(struct_processus *s	Line 1343 instruction_sqlquery(struct_processus *s
else	else
{	{
if ((((l_element_courant_ligne).donnee).objet	if ((((l_element_courant_ligne).donnee).objet
= malloc((PQgetlength(	= malloc(((size_t) (PQgetlength(
resultat_postgresql, i, j) + 1) *	resultat_postgresql, i, j) + 1)) *
sizeof(unsigned char))) == NULL)	sizeof(unsigned char))) == NULL)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
Line 1427 instruction_sqlquery(struct_processus *s	Line 1427 instruction_sqlquery(struct_processus *s
const char *queue;	const char *queue;
const unsigned char *resultat;	const unsigned char *resultat;

	int i;
int ios;	int ios;
	int nombre_colonnes;

logical1 presence_resultat;	logical1 presence_resultat;

Line 1438 instruction_sqlquery(struct_processus *s	Line 1440 instruction_sqlquery(struct_processus *s

struct_objet *s_objet_resultat;	struct_objet *s_objet_resultat;

unsigned int i;	struct timespec attente;
unsigned int nombre_colonnes;

if (sqlite3_prepare_v2((((struct_connecteur_sql )	if (sqlite3_prepare_v2((((struct_connecteur_sql )
(*s_objet_1).objet)).descripteur.sqlite,	(*s_objet_1).objet)).descripteur.sqlite,
(unsigned char ) (s_objet_2).objet,	(unsigned char ) (s_objet_2).objet,
strlen((unsigned char ) (s_objet_2).objet),	(int) strlen((unsigned char ) (s_objet_2).objet),
&ppStmt, &queue) != SQLITE_OK)	&ppStmt, &queue) != SQLITE_OK)
{	{
if (connexion_permanente == d_faux)	if (connexion_permanente == d_faux)
Line 1464 instruction_sqlquery(struct_processus *s	Line 1465 instruction_sqlquery(struct_processus *s
s_objet_resultat = NULL;	s_objet_resultat = NULL;
l_element_courant = NULL;	l_element_courant = NULL;

	attente.tv_sec = 0;
	attente.tv_nsec = GRANULARITE_us * 1000;

do	do
{	{
switch(ios = sqlite3_step(ppStmt))	switch(ios = sqlite3_step(ppStmt))
Line 1628 instruction_sqlquery(struct_processus *s	Line 1632 instruction_sqlquery(struct_processus *s
break;	break;
}	}

	case SQLITE_BUSY:
	case SQLITE_LOCKED:
	{
	nanosleep(&attente, NULL);
	INCR_GRANULARITE(attente.tv_nsec);
	break;
	}

default:	default:
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.53
changed lines
	Added in v.1.57