From 2d91cc4a3b22a1b417ca5f707f137b84262bb4ec Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 9 Oct 2011 12:33:48 +0000 Subject: On range tout le code actuel du trunk dans une branche nommée "0.x" et on crée une branche 1.x qui contiendra une nouvelle mouture (re-conception, méta info de packaging...). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///var/svn/2011-ddhardrescue/trunk@29 d3078510-dda0-49f1-841c-895ef4b7ec81 --- inc/cursesview.h | 9 --------- inc/recover.h | 11 ----------- inc/slices.h | 50 -------------------------------------------------- inc/slices_evt.h | 19 ------------------- inc/utils.h | 17 ----------------- 5 files changed, 106 deletions(-) delete mode 100644 inc/cursesview.h delete mode 100644 inc/recover.h delete mode 100755 inc/slices.h delete mode 100644 inc/slices_evt.h delete mode 100755 inc/utils.h (limited to 'inc') diff --git a/inc/cursesview.h b/inc/cursesview.h deleted file mode 100644 index f4d343a..0000000 --- a/inc/cursesview.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef CURSESVIEW_H -#define CURSESVIEW_H - -#include "slices_evt.h" - -void cursesMainLoop(slices_evt_t *slicesEvt); - -#endif /*CURSESVIEW_H*/ - diff --git a/inc/recover.h b/inc/recover.h deleted file mode 100644 index eee8141..0000000 --- a/inc/recover.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef RECOVER_H -#define RECOVER_H - -#include "slices_evt.h" - -extern int end; - -void recover(slices_evt_t *slicesEvt, char *src, char *dst, char*ddOpts); -int tryRecoverUntilError(slice_t *sliceToRead, address_t *firstError, char *src, char *dst, char *ddOpts); - -#endif /*RECOVER_H*/ diff --git a/inc/slices.h b/inc/slices.h deleted file mode 100755 index b994636..0000000 --- a/inc/slices.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef SLICES_H -#define SLICES_H - -#include -#include -#include - -/* IMPORTANT NOTES -Slice are inclusive intervals. Let say sliceNew(1,2,S_UNKNOWN,NULL) return a [1;2] interval, - so interval lenght is end-begin+1. Here, it is 2 sectors lenght slice. -*/ - -typedef enum { S_UNKNOWN, S_RECOVERED, S_UNREADABLE } sliceStatus_t; -typedef unsigned long long int address_t; - -typedef struct _slice { - address_t begin, end; - sliceStatus_t status; - struct _slice *next; -} slice_t; - -typedef struct { - int count; - slice_t *first, *last; - address_t min, max; - pthread_mutex_t writeOrConsistentReadMutex; -} slices_t; - -slice_t *sliceNew(address_t begin, address_t end, sliceStatus_t status, slice_t *next); -void sliceDelete(slice_t *s); - -// Return the numbers of slices after split (3 in the general case, 2 or 1 in particular cases. -1 is memory error) -int sliceSplit(slices_t *slices, slice_t *initialSlice, address_t splitAt, sliceStatus_t statusBefore, sliceStatus_t statusAt, sliceStatus_t statusAfter); - -void sliceDumpUpdate(char *dump, slice_t *s, address_t blockSize, unsigned int charCount, address_t begin, address_t end); - -slices_t *slicesNewEmpty(); - -slices_t *slicesNewSingleton(address_t begin, address_t end, sliceStatus_t status); -void slicesDelete(slices_t *slices); - -void slicesAppend(slices_t *slices, slice_t *slice); - -slice_t *slicesFindLargest(slices_t *slices, sliceStatus_t status); - -slice_t *slicesFindLargestFast(slices_t *slices, address_t *foundMax, sliceStatus_t status, address_t knownMax, slice_t *firstToTry); - -char *slicesDump(slices_t *slices, address_t *blockSize, unsigned int charCount, address_t begin, address_t end); - -#endif /*SLICES_H*/ diff --git a/inc/slices_evt.h b/inc/slices_evt.h deleted file mode 100644 index d5772b3..0000000 --- a/inc/slices_evt.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef SLICES_EVT_H -#define SLICES_EVT_H - -#include "slices.h" - -//typedef enum { EV_BOUNDARY, EV_TYPE } sliceEvtKind_t; - -typedef struct _slices_evt_t { - slices_t *data; - void (*eventListener)(/*sliceEvtKind_t evtKind,*/ struct _slices_evt_t *slicesEvt, slice_t *slice); - pthread_mutex_t eventListenerMutex; -} slices_evt_t; - -int sliceEvtSplit(slices_evt_t *slicesEvt, slice_t *initialSlice, address_t splitAt, sliceStatus_t statusBefore, sliceStatus_t statusAt, sliceStatus_t statusAfter); - -//void sliceEvtPutEvent(slices_evt_t *slicesEvt, slice_t *modifiedSlice); - -#endif /*SLICES_EVT_H */ - diff --git a/inc/utils.h b/inc/utils.h deleted file mode 100755 index 8492179..0000000 --- a/inc/utils.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef UTILS_H -#define UTILS_H - -#include -#include "slices.h" - -struct progArgs { - char *src, *dst, *ddOpts, *dump; - address_t beginSector, endSector, blockSize; -}; - -int parseArgs(int argc, char **argv, struct progArgs *args); -void usage(char *progname); -int cursesInit(WINDOW *wins[], PANEL *panels[], int count); -void cursesUnInit(WINDOW *wins[], PANEL *panels[], int count); - -#endif /*UTILS_H*/ -- cgit v1.2.3