bitcollider-commits

[Robert K. <may...@us...>]

Update of /cvsroot/bitcollider/bitcollider/lib
In directory usw-pr-cvs1:/tmp/cvs-serv16426/lib

Modified Files:
	main.c tigertree.c 
Log Message:
Some cleanup for 0.3.3


Index: main.c
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/lib/main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** main.c	2001/08/13 18:38:15	1.32
--- main.c	2001/08/23 20:39:42	1.33
***************
*** 35,39 ****
  #define DEFAULT_NUM_ATTRS       16
  #define GROW_NUM_ATTRS          16
! #define MD5_SANITY_CHECK_FAILED	"The MD5 hash function compiled into the bitcollider is faulty."
  #define MD5_SANITY_CHECK_EMPTY  "4SQ23YNRAC3AJ4NABGNQ38CCR2"
  #define MD5_SANITY_CHECK_01234  "IEANJXCPXEMZET9EJJR6CXDHRA"
--- 35,39 ----
  #define DEFAULT_NUM_ATTRS       16
  #define GROW_NUM_ATTRS          16
! #define MD5_SANITY_CHECK_FAILED "The MD5 hash function compiled into the bitcollider is faulty."
  #define MD5_SANITY_CHECK_EMPTY  "4SQ23YNRAC3AJ4NABGNQ38CCR2"
  #define MD5_SANITY_CHECK_01234  "IEANJXCPXEMZET9EJJR6CXDHRA"
***************
*** 206,214 ****
      }
  
! 	if (!check_md5_hash())
! 	{
! 		set_error(submission, MD5_SANITY_CHECK_FAILED);
! 		return false;
! 	}
  
      if (submission->bc->exitNow)
--- 206,214 ----
      }
  
!     if (!check_md5_hash())
!     {
!         set_error(submission, MD5_SANITY_CHECK_FAILED);
!         return false;
!     }
  
      if (submission->bc->exitNow)
***************
*** 653,657 ****
  
             percentComplete = (int)(((word64)ftell(source) * (word64)100) / 
!      			                    (word64)submission->fileSize);
             if (percentComplete != submission->percentComplete)
             {
--- 653,657 ----
  
             percentComplete = (int)(((word64)ftell(source) * (word64)100) / 
!                                     (word64)submission->fileSize);
             if (percentComplete != submission->percentComplete)
             {
***************
*** 819,844 ****
      char                  *c, *t;
      int                    line, empty = 1;
! 	FILE                  *infile;
  
! 	if (strcmp(fileName, "-"))
! 	   infile = stdin;
! 	else
         infile = fopen(fileName, "rb");
  
      submission = (BitcolliderSubmission *)malloc(sizeof(BitcolliderSubmission));
      if (submission == NULL)
! 	{
! 	   fclose(infile);
         return NULL;
! 	}
      memset(submission, 0, sizeof(BitcolliderSubmission));
      submission->bc = bc;
  
! 	if (infile == NULL)
! 	{
         sprintf(err, "Can't open tag file: %s", strerror(errno));
         set_error(submission, err);
! 	   return submission;
! 	}
  
      last[0] = 0;
--- 819,844 ----
      char                  *c, *t;
      int                    line, empty = 1;
!     FILE                  *infile;
  
!     if (strcmp(fileName, "-"))
!        infile = stdin;
!     else
         infile = fopen(fileName, "rb");
  
      submission = (BitcolliderSubmission *)malloc(sizeof(BitcolliderSubmission));
      if (submission == NULL)
!     {
!        fclose(infile);
         return NULL;
!     }
      memset(submission, 0, sizeof(BitcolliderSubmission));
      submission->bc = bc;
  
!     if (infile == NULL)
!     {
         sprintf(err, "Can't open tag file: %s", strerror(errno));
         set_error(submission, err);
!        return submission;
!     }
  
      last[0] = 0;
***************
*** 852,856 ****
                sprintf(err, "Line %d exceeds length limit", line );
                set_error(submission, err);
! 	          fclose(infile);
                submission->numBitprints = 0;
                return submission;
--- 852,856 ----
                sprintf(err, "Line %d exceeds length limit", line );
                set_error(submission, err);
!               fclose(infile);
                submission->numBitprints = 0;
                return submission;
***************
*** 860,864 ****
                sprintf(err, "Line %d is truncated", line );
                set_error(submission, err);
! 	          fclose(infile);
                submission->numBitprints = 0;
                return submission;
--- 860,864 ----
                sprintf(err, "Line %d is truncated", line );
                set_error(submission, err);
!               fclose(infile);
                submission->numBitprints = 0;
                return submission;
***************
*** 890,895 ****
                sprintf(err, "Line %d does not appear to contain a tag", line);
                set_error(submission, err);
! 	          fclose(infile);
! 			  submission->numBitprints = 0;
                return submission;
             }
--- 890,895 ----
                sprintf(err, "Line %d does not appear to contain a tag", line);
                set_error(submission, err);
!               fclose(infile);
!               submission->numBitprints = 0;
                return submission;
             }
***************
*** 921,925 ****
      }
  
! 	fclose(infile);
  
      return submission;
--- 921,925 ----
      }
  
!     fclose(infile);
  
      return submission;
***************
*** 973,977 ****
      struct MD5Context  md5context; 
      unsigned char      md5Digest[16];
! 	char               md5Hash[33];
  
      MD5Init(&md5context);
--- 973,977 ----
      struct MD5Context  md5context; 
      unsigned char      md5Digest[16];
!     char               md5Hash[33];
  
      MD5Init(&md5context);
***************
*** 979,984 ****
      bitziEncodeBase32(md5Digest, 16, md5Hash);
  
! 	if (strcmp(MD5_SANITY_CHECK_EMPTY, md5Hash))
! 	    return false;
  
      MD5Init(&md5context);
--- 979,984 ----
      bitziEncodeBase32(md5Digest, 16, md5Hash);
  
!     if (strcmp(MD5_SANITY_CHECK_EMPTY, md5Hash))
!         return false;
  
      MD5Init(&md5context);
***************
*** 986,995 ****
      MD5Final(md5Digest, &md5context);
      bitziEncodeBase32(md5Digest, 16, md5Hash);
- 	printf("01234: %s\n", md5Hash);
  
! 	if (strcmp(MD5_SANITY_CHECK_01234, md5Hash))
! 	    return false;
  
! 	return true;
  }
  
--- 986,994 ----
      MD5Final(md5Digest, &md5context);
      bitziEncodeBase32(md5Digest, 16, md5Hash);
  
!     if (strcmp(MD5_SANITY_CHECK_01234, md5Hash))
!         return false;
  
!     return true;
  }
  

Index: tigertree.c
===================================================================
RCS file: /cvsroot/bitcollider/bitcollider/lib/tigertree.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** tigertree.c	2001/08/21 17:55:33	1.3
--- tigertree.c	2001/08/23 20:39:42	1.4
***************
*** 114,143 ****
    }
    memmove(s,ctx->nodes,TIGERSIZE);
- 
- #if (defined BIG_ENDIAN)
-   {
-      word32 *i;
-      byte   *b, btemp;
-      word16 *w, wtemp;
- 
-      for(i = (word32 *)s; i < ((word32 *)s) + 6; i++)
-      {
-          b = (byte *)i;
-          btemp = *b;
-          *b = *(b + 1);
-          *(b + 1) = btemp;
- 
-          b+=2;
-          btemp = *(b);
-          *b = *(b + 1);
-          *(b + 1) = btemp;
- 
-          w = (word16 *)i;
-          wtemp = *w;
-          *w = *(w + 1);
-          *(w + 1) = wtemp;
-      }
-   }
- #endif
  }
  
--- 114,117 ----