From a16bbc3990cc3c9ef1228508246f9f6840d9ffa2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 13 Apr 1998 07:26:37 +0000
Subject: [PATCH] a few code cleanups

---
 hlink.c | 84 +++++++++++++++++++++++++++++++--------------------------
 match.c |  2 +-
 2 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/hlink.c b/hlink.c
index eef7c54c..31c19cd8 100644
--- a/hlink.c
+++ b/hlink.c
@@ -31,10 +31,10 @@ static int hlink_compare(struct file_struct *f1,struct file_struct *f2)
   if (!S_ISREG(f2->mode)) return 1;
 
   if (f1->dev != f2->dev) 
-    return (int)(f1->dev - f2->dev);
+    return (int)(f1->dev>f2->dev?1:-1);
 
   if (f1->inode != f2->inode) 
-    return (f1->inode - f2->inode);
+    return (int)(f1->inode>f2->inode?1:-1);
 
   return file_compare(&f1,&f2);
 }
@@ -103,47 +103,55 @@ int check_hard_link(struct file_struct *file)
 }
 
 
+#if SUPPORT_HARD_LINKS
+static void hard_link_one(int i)
+{
+	struct stat st1,st2;
+
+	if (link_stat(f_name(&hlink_list[i-1]),&st1) != 0) return;
+
+	if (link_stat(f_name(&hlink_list[i]),&st2) != 0) {
+		if (do_link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
+			if (verbose > 0)
+				fprintf(FINFO,"link %s => %s : %s\n",
+					f_name(&hlink_list[i]),
+					f_name(&hlink_list[i-1]),strerror(errno));
+			return;
+		}
+	} else {
+		if (st2.st_dev == st1.st_dev && st2.st_ino == st1.st_ino) return;
+		
+		if (do_unlink(f_name(&hlink_list[i])) != 0 ||
+		    do_link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
+			if (verbose > 0)
+				fprintf(FINFO,"link %s => %s : %s\n",
+					f_name(&hlink_list[i]),
+					f_name(&hlink_list[i-1]),strerror(errno));
+			return;
+		}
+	}
+	if (verbose > 0)
+		fprintf(FINFO,"%s => %s\n",
+			f_name(&hlink_list[i]),f_name(&hlink_list[i-1]));
+}
+#endif
+
 /* create any hard links in the flist */
 void do_hard_links(struct file_list *flist)
 {
 #if SUPPORT_HARD_LINKS
-  int i;
+	int i;
   
-  if (!hlink_list) return;
-
-  for (i=1;i<hlink_count;i++) {
-    if (S_ISREG(hlink_list[i].mode) &&
-	S_ISREG(hlink_list[i-1].mode) &&
-	hlink_list[i].basename && hlink_list[i-1].basename &&
-	hlink_list[i].dev == hlink_list[i-1].dev &&
-	hlink_list[i].inode == hlink_list[i-1].inode) {
-      struct stat st1,st2;
-
-      if (link_stat(f_name(&hlink_list[i-1]),&st1) != 0) continue;
-      if (link_stat(f_name(&hlink_list[i]),&st2) != 0) {
-	if (do_link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
-		if (verbose > 0)
-			fprintf(FINFO,"link %s => %s : %s\n",
-				f_name(&hlink_list[i]),
-				f_name(&hlink_list[i-1]),strerror(errno));
-	  continue;
+	if (!hlink_list) return;
+
+	for (i=1;i<hlink_count;i++) {
+		if (S_ISREG(hlink_list[i].mode) &&
+		    S_ISREG(hlink_list[i-1].mode) &&
+		    hlink_list[i].basename && hlink_list[i-1].basename &&
+		    hlink_list[i].dev == hlink_list[i-1].dev &&
+		    hlink_list[i].inode == hlink_list[i-1].inode) {
+			hard_link_one(i);
+		}	
 	}
-      } else {
-	if (st2.st_dev == st1.st_dev && st2.st_ino == st1.st_ino) continue;
-	
-	if (do_unlink(f_name(&hlink_list[i])) != 0 ||
-	    do_link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
-		if (verbose > 0)
-			fprintf(FINFO,"link %s => %s : %s\n",
-				f_name(&hlink_list[i]),
-				f_name(&hlink_list[i-1]),strerror(errno));
-	  continue;
-	}
-      }
-      if (verbose > 0)
-	      fprintf(FINFO,"%s => %s\n",
-		      f_name(&hlink_list[i]),f_name(&hlink_list[i-1]));
-    }	
-  }
 #endif
 }
diff --git a/match.c b/match.c
index a97e7e14..7f6e7088 100644
--- a/match.c
+++ b/match.c
@@ -56,7 +56,7 @@ static tag *tag_table;
 
 static int compare_targets(struct target *t1,struct target *t2)
 {
-  return(t1->t - t2->t);
+  return((int)t1->t - (int)t2->t);
 }
 
 
-- 
2.34.1