--- rpl/src/interface_tex.c 2011/04/11 13:02:27 1.21.2.1 +++ rpl/src/interface_tex.c 2012/01/17 14:44:12 1.37 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.0.22 - Copyright (C) 1989-2011 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.6 + Copyright (C) 1989-2012 Dr. BERTRAND Joël This file is part of RPL/2. @@ -2351,15 +2351,8 @@ impression_tex(struct_processus *s_etat_ return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rpliconv_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rpliconv_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rpliconv") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -2374,15 +2367,8 @@ impression_tex(struct_processus *s_etat_ return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplfile_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplfile_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplfile") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -2414,15 +2400,8 @@ impression_tex(struct_processus *s_etat_ return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rpliconv_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rpliconv_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rpliconv") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return; @@ -2437,15 +2416,8 @@ impression_tex(struct_processus *s_etat_ return; } - if (controle(s_etat_processus, executable_candidat, "md5", - rplfile_md5) != d_vrai) - { - (*s_etat_processus).erreur_systeme = d_es_somme_controle; - return; - } - - if (controle(s_etat_processus, executable_candidat, "sha1", - rplfile_sha1) != d_vrai) + if (controle_integrite(s_etat_processus, executable_candidat, + "rplfile") != d_vrai) { (*s_etat_processus).erreur_systeme = d_es_somme_controle; return;