X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=convert-objects.c;h=a63013298566fd3dc21275a90ca976227de8c7f0;hb=2eff14259ea4035dc5f8a18f5998e88dd4da207e;hp=0fabd8981c6047e5144cfb3776b4f4a5588f24e5;hpb=160a59f326d55970f8a038ef635c662b9c648c75;p=git.git

diff --git a/convert-objects.c b/convert-objects.c
index 0fabd8981..a63013298 100644
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -1,6 +1,3 @@
-#define _XOPEN_SOURCE 500 /* glibc2 and AIX 5.3L need this */
-#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
-#include <time.h>
 #include "cache.h"
 #include "blob.h"
 #include "commit.h"
@@ -22,7 +19,7 @@ static struct entry * convert_entry(unsigned char *sha1);
 static struct entry *insert_new(unsigned char *sha1, int pos)
 {
 	struct entry *new = xcalloc(1, sizeof(struct entry));
-	memcpy(new->old_sha1, sha1, 20);
+	hashcpy(new->old_sha1, sha1);
 	memmove(convert + pos + 1, convert + pos, (nr_convert - pos) * sizeof(struct entry *));
 	convert[pos] = new;
 	nr_convert++;
@@ -38,7 +35,7 @@ static struct entry *lookup_entry(unsigned char *sha1)
 	while (low < high) {
 		int next = (low + high) / 2;
 		struct entry *n = convert[next];
-		int cmp = memcmp(sha1, n->old_sha1, 20);
+		int cmp = hashcmp(sha1, n->old_sha1);
 		if (!cmp)
 			return n;
 		if (cmp < 0) {
@@ -53,7 +50,7 @@ static struct entry *lookup_entry(unsigned char *sha1)
 static void convert_binary_sha1(void *buffer)
 {
 	struct entry *entry = convert_entry(buffer);
-	memcpy(buffer, entry->new_sha1, 20);
+	hashcpy(buffer, entry->new_sha1);
 }
 
 static void convert_ascii_sha1(void *buffer)
@@ -103,7 +100,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
 		if (!slash) {
 			newlen += sprintf(new + newlen, "%o %s", mode, path);
 			new[newlen++] = '\0';
-			memcpy(new + newlen, (char *) buffer + len - 20, 20);
+			hashcpy((unsigned char*)new + newlen, (unsigned char *) buffer + len - 20);
 			newlen += 20;
 
 			used += len;
@@ -240,14 +237,14 @@ static void convert_date(void *buffer, unsigned long size, unsigned char *result
 {
 	char *new = xmalloc(size + 100);
 	unsigned long newlen = 0;
-	
-	// "tree <sha1>\n"
+
+	/* "tree <sha1>\n" */
 	memcpy(new + newlen, buffer, 46);
 	newlen += 46;
 	buffer = (char *) buffer + 46;
 	size -= 46;
 
-	// "parent <sha1>\n"
+	/* "parent <sha1>\n" */
 	while (!memcmp(buffer, "parent ", 7)) {
 		memcpy(new + newlen, buffer, 48);
 		newlen += 48;
@@ -255,12 +252,12 @@ static void convert_date(void *buffer, unsigned long size, unsigned char *result
 		size -= 48;
 	}
 
-	// "author xyz <xyz> date"
+	/* "author xyz <xyz> date" */
 	newlen += convert_date_line(new + newlen, &buffer, &size);
-	// "committer xyz <xyz> date"
+	/* "committer xyz <xyz> date" */
 	newlen += convert_date_line(new + newlen, &buffer, &size);
 
-	// Rest
+	/* Rest */
 	memcpy(new + newlen, buffer, size);
 	newlen += size;