rpl/src/instructions_w1.c - diff

Return to instructions_w1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_w1.c between versions 1.8 and 1.9

version 1.8, 2010/03/08 14:28:20	version 1.9, 2010/03/08 16:44:10
Line 462 instruction_write(struct_processus *s_et	Line 462 instruction_write(struct_processus *s_et
if ((((*s_etat_processus).l_base_pile).donnee).type == FCH)	if ((((*s_etat_processus).l_base_pile).donnee).type == FCH)
{	{
if ((((struct_fichier ) (((*s_etat_processus).l_base_pile)	if ((((struct_fichier ) (((*s_etat_processus).l_base_pile)
.donnee).objet)).acces == 'S')	.donnee).objet)).acces == 'D')
{	{
if (empilement_pile_last(s_etat_processus, 2) == d_erreur)	if (empilement_pile_last(s_etat_processus, 3) == d_erreur)
{	{
return;	return;
}	}
}	}
else	else
{	{
if (empilement_pile_last(s_etat_processus, 3) == d_erreur)	if (empilement_pile_last(s_etat_processus, 2) == d_erreur)
{	{
return;	return;
}	}
Line 686 instruction_write(struct_processus *s_et	Line 686 instruction_write(struct_processus *s_et
"(id, data) values (%lld, '%s')", (((integer8 )	"(id, data) values (%lld, '%s')", (((integer8 )
(*s_objet_argument_2).objet)), chaine_utf8) < 0)	(*s_objet_argument_2).objet)), chaine_utf8) < 0)
{	{
free(chaine_utf8);	(*s_etat_processus).erreur_systeme =
liberation(s_etat_processus, s_objet_argument_3);	d_es_allocation_memoire;
liberation(s_etat_processus, s_objet_argument_2);
liberation(s_etat_processus, s_objet_argument_1);

return;	return;
}	}

Line 733 instruction_write(struct_processus *s_et	Line 730 instruction_write(struct_processus *s_et
return;	return;
}	}

// Récupération de la valeur de la clef	// Récupération de la position de la clef

if (alsprintf(&commande, "select key from control "	if (alsprintf(&commande, "select key from control "
"where id = 1") < 0)	"where id = 1") < 0)
{	{
liberation(s_etat_processus, s_objet_argument_2);	(*s_etat_processus).erreur_systeme =
liberation(s_etat_processus, s_objet_argument_1);	d_es_allocation_memoire;

return;	return;
}	}

Line 748 instruction_write(struct_processus *s_et	Line 744 instruction_write(struct_processus *s_et
commande, strlen(commande), &ppStmt, &queue)	commande, strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
d_es_erreur_fichier;
return;	return;
}	}

if (sqlite3_step(ppStmt) != SQLITE_ROW)	if (sqlite3_step(ppStmt) != SQLITE_ROW)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
d_es_erreur_fichier;
return;	return;
}	}

if (sqlite3_column_type(ppStmt, 0) != SQLITE_INTEGER)	if (sqlite3_column_type(ppStmt, 0) != SQLITE_INTEGER)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
d_es_erreur_fichier;
return;	return;
}	}

Line 771 instruction_write(struct_processus *s_et	Line 764 instruction_write(struct_processus *s_et

if (sqlite3_step(ppStmt) != SQLITE_DONE)	if (sqlite3_step(ppStmt) != SQLITE_DONE)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
d_es_erreur_fichier;
return;	return;
}	}

if (sqlite3_finalize(ppStmt) != SQLITE_OK)	if (sqlite3_finalize(ppStmt) != SQLITE_OK)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
d_es_erreur_fichier;
return;	return;
}	}

Line 901 instruction_write(struct_processus *s_et	Line 892 instruction_write(struct_processus *s_et
if (alsprintf(&commande, "select id from key where key = "	if (alsprintf(&commande, "select id from key where key = "
"'%s'", clef_utf8) < 0)	"'%s'", clef_utf8) < 0)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
liberation(s_etat_processus, s_objet_argument_2);
liberation(s_etat_processus, s_objet_argument_1);

return;	return;
}	}

Line 913 instruction_write(struct_processus *s_et	Line 901 instruction_write(struct_processus *s_et
commande, strlen(commande), &ppStmt, &queue)	commande, strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;
return;	return;
}	}

Line 937 instruction_write(struct_processus *s_et	Line 923 instruction_write(struct_processus *s_et

if (sqlite3_finalize(ppStmt) != SQLITE_OK)	if (sqlite3_finalize(ppStmt) != SQLITE_OK)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 948 instruction_write(struct_processus *s_et	Line 933 instruction_write(struct_processus *s_et
if (alsprintf(&commande, "insert into key "	if (alsprintf(&commande, "insert into key "
"(key) values ('%s')", clef_utf8) < 0)	"(key) values ('%s')", clef_utf8) < 0)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
liberation(s_etat_processus, s_objet_argument_2);
liberation(s_etat_processus, s_objet_argument_1);

return;	return;
}	}

Line 961 instruction_write(struct_processus *s_et	Line 943 instruction_write(struct_processus *s_et
commande, strlen(commande), &ppStmt, &queue)	commande, strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 969 instruction_write(struct_processus *s_et	Line 950 instruction_write(struct_processus *s_et

if (sqlite3_step(ppStmt) != SQLITE_DONE)	if (sqlite3_step(ppStmt) != SQLITE_DONE)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 977 instruction_write(struct_processus *s_et	Line 957 instruction_write(struct_processus *s_et

if (sqlite3_finalize(ppStmt) != SQLITE_OK)	if (sqlite3_finalize(ppStmt) != SQLITE_OK)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 988 instruction_write(struct_processus *s_et	Line 967 instruction_write(struct_processus *s_et
if (alsprintf(&commande, "select id from key "	if (alsprintf(&commande, "select id from key "
"where key = '%s'", clef_utf8) < 0)	"where key = '%s'", clef_utf8) < 0)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
liberation(s_etat_processus, s_objet_argument_2);
liberation(s_etat_processus, s_objet_argument_1);

return;	return;
}	}

Line 1001 instruction_write(struct_processus *s_et	Line 977 instruction_write(struct_processus *s_et
commande, strlen(commande), &ppStmt, &queue)	commande, strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 1009 instruction_write(struct_processus *s_et	Line 984 instruction_write(struct_processus *s_et

if (sqlite3_step(ppStmt) != SQLITE_ROW)	if (sqlite3_step(ppStmt) != SQLITE_ROW)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 1020 instruction_write(struct_processus *s_et	Line 994 instruction_write(struct_processus *s_et

default:	default:
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 1029 instruction_write(struct_processus *s_et	Line 1002 instruction_write(struct_processus *s_et

if (sqlite3_column_type(ppStmt, 0) != SQLITE_INTEGER)	if (sqlite3_column_type(ppStmt, 0) != SQLITE_INTEGER)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
d_es_erreur_fichier;
return;	return;
}	}

Line 1038 instruction_write(struct_processus *s_et	Line 1010 instruction_write(struct_processus *s_et

if (sqlite3_step(ppStmt) != SQLITE_DONE)	if (sqlite3_step(ppStmt) != SQLITE_DONE)
{	{
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
d_es_erreur_fichier;
return;	return;
}	}

if (sqlite3_finalize(ppStmt) != SQLITE_OK)	if (sqlite3_finalize(ppStmt) != SQLITE_OK)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;
return;	return;
}	}

Line 1060 instruction_write(struct_processus *s_et	Line 1029 instruction_write(struct_processus *s_et
if (alsprintf(&commande, "update key set key = '%s' where "	if (alsprintf(&commande, "update key set key = '%s' where "
"id = %lld", clef_utf8, id) < 0)	"id = %lld", clef_utf8, id) < 0)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
liberation(s_etat_processus, s_objet_argument_2);
liberation(s_etat_processus, s_objet_argument_1);

return;	return;
}	}

Line 1072 instruction_write(struct_processus *s_et	Line 1038 instruction_write(struct_processus *s_et
commande, strlen(commande), &ppStmt, &queue)	commande, strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 1080 instruction_write(struct_processus *s_et	Line 1045 instruction_write(struct_processus *s_et

if (sqlite3_step(ppStmt) != SQLITE_DONE)	if (sqlite3_step(ppStmt) != SQLITE_DONE)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 1088 instruction_write(struct_processus *s_et	Line 1052 instruction_write(struct_processus *s_et

if (sqlite3_finalize(ppStmt) != SQLITE_OK)	if (sqlite3_finalize(ppStmt) != SQLITE_OK)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 1102 instruction_write(struct_processus *s_et	Line 1065 instruction_write(struct_processus *s_et
if (alsprintf(&commande, "delete from data where "	if (alsprintf(&commande, "delete from data where "
"key_id = %lld", id) < 0)	"key_id = %lld", id) < 0)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme =
	d_es_allocation_memoire;
liberation(s_etat_processus, s_objet_argument_2);
liberation(s_etat_processus, s_objet_argument_1);

return;	return;
}	}

Line 1114 instruction_write(struct_processus *s_et	Line 1074 instruction_write(struct_processus *s_et
commande, strlen(commande), &ppStmt, &queue)	commande, strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;
return;	return;
}	}

if (sqlite3_step(ppStmt) != SQLITE_DONE)	if (sqlite3_step(ppStmt) != SQLITE_DONE)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;
return;	return;
}	}

if (sqlite3_finalize(ppStmt) != SQLITE_OK)	if (sqlite3_finalize(ppStmt) != SQLITE_OK)
{	{
free(clef_utf8);	(*s_etat_processus).erreur_systeme = d_es_erreur_fichier;
(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;
return;	return;
}	}

Line 1219 instruction_write(struct_processus *s_et	Line 1173 instruction_write(struct_processus *s_et
'F', &longueur_effective, &recursivite)) == NULL)	'F', &longueur_effective, &recursivite)) == NULL)
{	{
free(clef_utf8);	free(clef_utf8);

liberation(s_etat_processus, s_element);	liberation(s_etat_processus, s_element);
liberation(s_etat_processus, s_format);	liberation(s_etat_processus, s_format);
liberation(s_etat_processus, s_objet_argument_2);	liberation(s_etat_processus, s_objet_argument_2);
Line 1245 instruction_write(struct_processus *s_et	Line 1200 instruction_write(struct_processus *s_et
"(data, key_id, sequence) values "	"(data, key_id, sequence) values "
"('%s', %lld, %lld)", chaine_utf8, id, ordre) < 0)	"('%s', %lld, %lld)", chaine_utf8, id, ordre) < 0)
{	{
free(chaine_utf8);	(*s_etat_processus).erreur_systeme =
free(clef_utf8);	d_es_allocation_memoire;
liberation(s_etat_processus, s_objet_argument_2);
liberation(s_etat_processus, s_objet_argument_1);

return;	return;
}	}

Line 1257 instruction_write(struct_processus *s_et	Line 1209 instruction_write(struct_processus *s_et
commande, strlen(commande), &ppStmt, &queue)	commande, strlen(commande), &ppStmt, &queue)
!= SQLITE_OK)	!= SQLITE_OK)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 1265 instruction_write(struct_processus *s_et	Line 1216 instruction_write(struct_processus *s_et

if (sqlite3_step(ppStmt) != SQLITE_DONE)	if (sqlite3_step(ppStmt) != SQLITE_DONE)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;
Line 1273 instruction_write(struct_processus *s_et	Line 1223 instruction_write(struct_processus *s_et

if (sqlite3_finalize(ppStmt) != SQLITE_OK)	if (sqlite3_finalize(ppStmt) != SQLITE_OK)
{	{
free(clef_utf8);
(*s_etat_processus).erreur_systeme =	(*s_etat_processus).erreur_systeme =
d_es_erreur_fichier;	d_es_erreur_fichier;
return;	return;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.8
changed lines
	Added in v.1.9