--- rpl/src/instructions_d4.c 2013/03/20 17:11:44 1.49 +++ rpl/src/instructions_d4.c 2015/01/27 14:18:06 1.60 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.13 - Copyright (C) 1989-2013 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.20 + Copyright (C) 1989-2015 Dr. BERTRAND Joël This file is part of RPL/2. @@ -310,9 +310,9 @@ instruction_delete(struct_processus *s_e return; } - if (alsprintf(&commande, "select count(*) from data where " - "id = %lld", (*((integer8 *) (*s_objet_indice).objet))) - < 0) + if (alsprintf(s_etat_processus, &commande, + "select count(*) from data where id = %lld", + (*((integer8 *) (*s_objet_indice).objet))) < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -377,7 +377,8 @@ instruction_delete(struct_processus *s_e return; } - if (alsprintf(&commande, "delete from data where id = %lld", + if (alsprintf(s_etat_processus, &commande, + "delete from data where id = %lld", (*((integer8 *) (*s_objet_indice).objet))) < 0) { (*s_etat_processus).erreur_systeme = @@ -441,8 +442,9 @@ instruction_delete(struct_processus *s_e return; } - if (alsprintf(&commande, "select id from key where key = " - "'{ \"%s\" }'", utf8) < 0) + if (alsprintf(s_etat_processus, &commande, + "select id from key where key = '{ \"%s\" }'", utf8) + < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -534,8 +536,9 @@ instruction_delete(struct_processus *s_e free(commande); - if (alsprintf(&commande, "delete from data where key_id = %lld", - lecture_i64) < 0) + if (alsprintf(s_etat_processus, &commande, + "delete from data where key_id = %lld", lecture_i64) + < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -565,8 +568,8 @@ instruction_delete(struct_processus *s_e free(commande); - if (alsprintf(&commande, "delete from key where id = %lld", - lecture_i64) < 0) + if (alsprintf(s_etat_processus, &commande, + "delete from key where id = %lld", lecture_i64) < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -853,10 +856,10 @@ instruction_drws(struct_processus *s_eta if (((*s_etat_processus).colonne_statistique_1 < 1) || ((*s_etat_processus).colonne_statistique_2 < 1) || - ((*s_etat_processus).colonne_statistique_1 > (signed long) + ((*s_etat_processus).colonne_statistique_1 > (*((struct_matrice *) (*s_objet_statistique).objet)) .nombre_colonnes) || - ((*s_etat_processus).colonne_statistique_2 > (signed long) + ((*s_etat_processus).colonne_statistique_2 > (*((struct_matrice *) (*s_objet_statistique).objet)) .nombre_colonnes)) {