From c324adfff288a8e8ab97a4ba094d631c1f55f487 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 22 Mar 2009 17:44:29 +0000 Subject: [PATCH] Some cleanups to the types of vars. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@689 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- aide.c | 12 ++++++------ divers.c | 2 +- files.c | 2 +- global.h | 4 +--- loadsave.c | 32 ++++++++++++++++---------------- struct.h | 7 ++++--- 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/aide.c b/aide.c index 7bef5d83..49b8493e 100644 --- a/aide.c +++ b/aide.c @@ -591,7 +591,7 @@ void Bouton_Stats(void) char Buffer[37]; dword Utilisation_couleur[256]; unsigned long long freeRam; - uint64_t Taille = 0; + qword Taille = 0; Ouvrir_fenetre(310,174,"Statistics"); @@ -643,7 +643,7 @@ void Bouton_Stats(void) { struct statfs Informations_Disque; statfs(Principal_Repertoire_courant,&Informations_Disque); - Taille=(uint64_t) Informations_Disque.f_bfree * (uint64_t) Informations_Disque.f_bsize; + Taille=(qword) Informations_Disque.f_bfree * (qword) Informations_Disque.f_bsize; } #else // Free disk space is only for shows. Other platforms can display 0. @@ -652,13 +652,13 @@ void Bouton_Stats(void) #endif if(Taille > (100ULL*1024*1024*1024)) - sprintf(Buffer,"%d Gigabytes",(unsigned int)(Taille/(1024*1024*1024))); + sprintf(Buffer,"%u Gigabytes",(unsigned int)(Taille/(1024*1024*1024))); else if(Taille > (100*1024*1024)) - sprintf(Buffer,"%d Megabytes",(unsigned int)(Taille/(1024*1024))); + sprintf(Buffer,"%u Megabytes",(unsigned int)(Taille/(1024*1024))); else if(Taille > (100*1024)) - sprintf(Buffer,"%d Kilobytes",(unsigned int)(Taille/1024)); + sprintf(Buffer,"%u Kilobytes",(unsigned int)(Taille/1024)); else - sprintf(Buffer,"%d bytes",(unsigned int)Taille); + sprintf(Buffer,"%u bytes",(unsigned int)Taille); Print_dans_fenetre(146,67,Buffer,STATS_COULEUR_DONNEES,CM_Noir); // Affichage des informations sur l'image diff --git a/divers.c b/divers.c index c7de43a5..9503a49c 100644 --- a/divers.c +++ b/divers.c @@ -206,7 +206,7 @@ void Ellipse_Calculer_limites(short Rayon_horizontal,short Rayon_vertical) byte Pixel_dans_ellipse(void) { - uint64_t ediesi = Ellipse_Curseur_X * Ellipse_Curseur_X * Ellipse_Rayon_vertical_au_carre + + qword ediesi = Ellipse_Curseur_X * Ellipse_Curseur_X * Ellipse_Rayon_vertical_au_carre + Ellipse_Curseur_Y * Ellipse_Curseur_Y * Ellipse_Rayon_horizontal_au_carre; if((ediesi) <= Ellipse_Limite) return 255; diff --git a/files.c b/files.c index 97ed1585..41a7e20c 100644 --- a/files.c +++ b/files.c @@ -275,7 +275,7 @@ void Lire_liste_des_fichiers(byte Format_demande) void bstrtostr( BSTR in, STRPTR out, TEXT max ) { STRPTR iptr; - uint32_t i; + dword i; iptr = BADDR( in ); diff --git a/global.h b/global.h index f91ac15f..f64af9b8 100644 --- a/global.h +++ b/global.h @@ -465,9 +465,7 @@ GFX2_GLOBAL long Ellipse_Curseur_X; GFX2_GLOBAL long Ellipse_Curseur_Y; GFX2_GLOBAL long Ellipse_Rayon_vertical_au_carre; GFX2_GLOBAL long Ellipse_Rayon_horizontal_au_carre; -//GFX2_GLOBAL long Ellipse_Limite_High; -//GFX2_GLOBAL long Ellipse_Limite_Low; -GFX2_GLOBAL uint64_t Ellipse_Limite; +GFX2_GLOBAL qword Ellipse_Limite; GFX2_GLOBAL long Cercle_Curseur_X; GFX2_GLOBAL long Cercle_Curseur_Y; GFX2_GLOBAL long Cercle_Limite; diff --git a/loadsave.c b/loadsave.c index c32f4308..69c07ffa 100644 --- a/loadsave.c +++ b/loadsave.c @@ -2226,23 +2226,23 @@ void Save_LBM(void) typedef struct { - word Signature; // ='BM' = 0x4D42 - uint32_t Taille_1; // =Taille du fichier - word Reserv_1; // =0 - word Reserv_2; // =0 - uint32_t Decalage; // Nb octets avant les données bitmap + word Signature; // ='BM' = 0x4D42 + dword Taille_1; // =Taille du fichier + word Reserv_1; // =0 + word Reserv_2; // =0 + dword Decalage; // Nb octets avant les données bitmap - uint32_t Taille_2; // =40 - uint32_t Width; - uint32_t Height; - word Plans; // =1 - word Nb_bits; // =1,4,8 ou 24 - uint32_t Compression; - uint32_t Taille_3; - uint32_t XPM; - uint32_t YPM; - uint32_t Nb_Clr; - uint32_t Clr_Imprt; + dword Taille_2; // =40 + dword Width; + dword Height; + word Plans; // =1 + word Nb_bits; // =1,4,8 ou 24 + dword Compression; + dword Taille_3; + dword XPM; + dword YPM; + dword Nb_Clr; + dword Clr_Imprt; } __attribute__((__packed__)) T_BMP_Header; // -- Tester si un fichier est au format BMP -------------------------------- diff --git a/struct.h b/struct.h index fabcb712..ccca9f60 100644 --- a/struct.h +++ b/struct.h @@ -32,9 +32,10 @@ // Déclaration des types de base ///////////////////////////////////////////// -typedef uint8_t byte; -typedef uint16_t word; -typedef uint32_t dword; +#define byte uint8_t +#define word uint16_t +#define dword uint32_t +#define qword uint64_t typedef void (* fonction_action) (void); typedef void (* fonction_afficheur) (word,word,byte);