Diff for /libaitsync/inc/aitsync.h between versions 1.3 and 1.4

version 1.3, 2012/07/22 22:09:47 version 1.4, 2012/11/13 14:19:39
Line 47  SUCH DAMAGE. Line 47  SUCH DAMAGE.
 #define __AITSYNC_H  #define __AITSYNC_H
   
   
 #include <sys/types.h>  
 #include <openssl/md5.h>  
   
   
 #define CHUNK_MAX       2048  
 #define DLTSYNC_MAGIC   0xD34DC0D3  
 #define SIGSYNC_MAGIC   0xDEADBEEF  
   
 #ifndef STRSIZ  
 #define STRSIZ          256  
 #endif  
   
   
 typedef struct tagSyncChunk {  
         u_int sc_magic;  
         u_long sc_id;  
         off_t sc_off;  
         size_t sc_len;  
         u_int sc_roll;  
         u_char sc_cksum[MD5_DIGEST_LENGTH];  
 } sync_chunk_t;  
   
   
 struct tagDirName {  
         u_char  ch;  
         u_short tag;  
         u_int   hash;  
         char    name[MAXPATHLEN];  
         char    extra[STRSIZ];  
 };  
   
   
 // -------------------------------------------------------  
 // sync_GetErrno() Get error code of last operation  // sync_GetErrno() Get error code of last operation
 inline int sync_GetErrno();  inline int sync_GetErrno();
 // sync_GetError() Get error text of last operation  // sync_GetError() Get error text of last operation
 inline const char *sync_GetError();  inline const char *sync_GetError();
 // -------------------------------------------------------  
   
 /*  /*
 * syncSignature() Calculate and create signature for diff * syncSignature() - Calculate and create signature for diff
 * @csInput = Input patched file name for calculating check sums *
  * @csInput = Input target file name for calculating check sums
  * @csSig = Output Signature file name   * @csSig = Output Signature file name
  * @compress = 2 compress signatures output, 0 not compressed   * @compress = 2 compress signatures output, 0 not compressed
  * return: -1 error, 0 ok   * return: -1 error, 0 ok
Line 96  inline const char *sync_GetError(); Line 63  inline const char *sync_GetError();
 int syncSignature(const char *csInput, const char *csSig, int compress);  int syncSignature(const char *csInput, const char *csSig, int compress);
   
 /*  /*
 * syncDelta() Create Delta patch file * syncDelta() - Create Delta patch file
  *
  * @csInput = Input original source file name for make delta patch file   * @csInput = Input original source file name for make delta patch file
 * @csSig = Input Signature file name * @csSig = Input target Signature file name
  * @csDelta = Output Delta patch file name   * @csDelta = Output Delta patch file name
  * @compress = 3 everything compress, 2 compressed signatures, 1 compress delta output, 0 not compressed   * @compress = 3 everything compress, 2 compressed signatures, 1 compress delta output, 0 not compressed
  * return: -1 error, 0 ok, create delta patch, 1 ok, no differences and not create patch   * return: -1 error, 0 ok, create delta patch, 1 ok, no differences and not create patch
Line 106  int syncSignature(const char *csInput, const char *csS Line 74  int syncSignature(const char *csInput, const char *csS
 int syncDelta(const char *csInput, const char *csSig, const char *csDelta, int compress);  int syncDelta(const char *csInput, const char *csSig, const char *csDelta, int compress);
   
 /*  /*
 * syncPatch() Apply delta patch file to target * syncPatch() - Apply delta patch file to target
  *
  * @csInput = Input target file name for patch   * @csInput = Input target file name for patch
  * @csDelta = Input Delta patch file name   * @csDelta = Input Delta patch file name
  * @csPatch = After applied patch create new alternate target file, if != NULL   * @csPatch = After applied patch create new alternate target file, if != NULL
Line 116  int syncDelta(const char *csInput, const char *csSig,  Line 85  int syncDelta(const char *csInput, const char *csSig, 
 int syncPatch(const char *csInput, const char *csDelta, const char *csPatch, int compress);  int syncPatch(const char *csInput, const char *csDelta, const char *csPatch, int compress);
   
   
   struct tagDirName {
           u_char  ch;
           u_short tag;
           u_int   hash;
           char    name[BUFSIZ];
           char    extra[BUFSIZ];
   };
   
 /*  /*
 * sync_dircmp() Compare directories * sync_dircmp() - Compare directories
  *
  * @csDir1 = Directory 1   * @csDir1 = Directory 1
  * @csDir2 = Directory 2   * @csDir2 = Directory 2
  * return: -1 error, 0 is equal or 1 different   * return: -1 error, 0 is equal or 1 different
  */   */
 int sync_dircmp(const char *csDir1, const char *csDir2);  int sync_dircmp(const char *csDir1, const char *csDir2);
 /*  /*
 * sync_dirCSum() Calculate checksum of directory * sync_dirChkSum() - Calculate checksum of directory
  *
  * @csDir = Directory   * @csDir = Directory
 * @md = Message digest allocated memory, must be free after use! * @md = Message digest allocated memory, must be free() after use!
  * return: -1 error or !=-1 ok   * return: -1 error or !=-1 ok
  */   */
int sync_dirCSum(const char *csDir, u_char **md);int sync_dirChkSum(const char *csDir, u_char **md);
 /*  /*
 * sync_dircmpList() Compare directories or directory and file list * sync_dircmpList() - Compare directories or directory and file list
  *
  * @csDir1 = Directory 1   * @csDir1 = Directory 1
  * @csDir2 = Directory 2 or File list, if "-" get input from console   * @csDir2 = Directory 2 or File list, if "-" get input from console
 * @lm = Long mode options, 1 long output * @lm = Long mode options, !=NULL long output
 * @list = Output diff list, after use must be free! * @list = Output diff list, after use must be free()!
  * return: -1 error, 0 is equal or >0 count of returned list items   * return: -1 error, 0 is equal or >0 count of returned list items
  */   */
 int sync_dircmpList(const char *csDir1, const char *csDir2, int lm, struct tagDirName **list);  int sync_dircmpList(const char *csDir1, const char *csDir2, int lm, struct tagDirName **list);

Removed from v.1.3  
changed lines
  Added in v.1.4


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>