crawl_folders.h: Rename to be alongside implementation.

[nmh] / sbr / fdcompare.c

diff --git a/sbr/fdcompare.c b/sbr/fdcompare.c
index 38174e021b77566b4efd0b2909be933f3debf68a..b745d170c68c0e4ee694f682e548f4131d14eab0 100644 (file)
--- a/sbr/fdcompare.c
+++ b/sbr/fdcompare.c
@@ -1,40 +1,39 @@
-
-/*
- * fdcompare.c -- are two files identical?
+/* fdcompare.c -- are two files identical?

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "fdcompare.h"

 
 
 int
 fdcompare (int fd1, int fd2)
 {
 
 
 int
 fdcompare (int fd1, int fd2)
 {

-    register int i, n1, n2, resp;
-    register char *c1, *c2;
+    int i, n1, n2;
+    char *c1, *c2;

     char b1[BUFSIZ], b2[BUFSIZ];
 
     char b1[BUFSIZ], b2[BUFSIZ];
 

-    resp = 1;
+    bool resp = true;

     while ((n1 = read (fd1, b1, sizeof(b1))) >= 0
            && (n2 = read (fd2, b2, sizeof(b2))) >= 0
            && n1 == n2) {
        c1 = b1;
        c2 = b2;
     while ((n1 = read (fd1, b1, sizeof(b1))) >= 0
            && (n2 = read (fd2, b2, sizeof(b2))) >= 0
            && n1 == n2) {
        c1 = b1;
        c2 = b2;

-       for (i = n1 < sizeof(b1) ? n1 : sizeof(b1); i--;)
+       for (i = n1 < (int) sizeof(b1) ? n1 : (int) sizeof(b1); i--;)

            if (*c1++ != *c2++) {
            if (*c1++ != *c2++) {

-               resp = 0;
+               resp = false;

                goto leave;
            }
                goto leave;
            }

-       if (n1 < sizeof(b1))
+       if (n1 < (int) sizeof(b1))

            goto leave;
     }
            goto leave;
     }

-    resp = 0;
+    resp = false;

 
 leave: ;
 
 leave: ;

-    lseek (fd1, (off_t) 0, SEEK_SET);
-    lseek (fd2, (off_t) 0, SEEK_SET);
+    lseek(fd1, 0, SEEK_SET);
+    lseek(fd2, 0, SEEK_SET);

     return resp;
 }
     return resp;
 }