From e9ef70cefa571bb1ada1ec515a433ed9a643a171 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Mon, 15 Aug 2011 16:26:07 +0000 Subject: Refactoring : Tout ce qui "ncurses" a été dégagé dans un "module" séparé. Le ddhardrescue.c est tout propre maintenant. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///var/svn/2011-ddhardrescue/trunk@21 d3078510-dda0-49f1-841c-895ef4b7ec81 --- src/slices.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/slices.c') diff --git a/src/slices.c b/src/slices.c index d077454..e84facf 100644 --- a/src/slices.c +++ b/src/slices.c @@ -1,13 +1,10 @@ -#include #include "slices.h" -//for perror -#include - -//FIXME : avoir une méthode destroy pour les slices qui free le mutex +#include +#include /* For perror() */ -inline int min(int a, int b) { return (ab)?a:b; } +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) slice_t *sliceNew(address_t begin, address_t end, sliceStatus_t status, slice_t *next) { slice_t *s; @@ -221,8 +218,8 @@ char *slicesDump(slices_t *slices, address_t *blockSize, unsigned int charCount, if ( (curr->begin >= begin && curr->begin <=end) || ( curr->end >= end && curr->end <= end ) ) { // Draw the slice on the right number of characters - sb=max(0, (curr->begin - begin) / *blockSize); - se=min((curr->end - begin) / *blockSize, charCount-1); + sb=MAX(0, (curr->begin - begin) / *blockSize); + se=MIN((curr->end - begin) / *blockSize, charCount-1); // Debug assertion if (sb >= charCount || se >= charCount) { -- cgit v1.2.3