Changeset 3115

Timestamp:

Oct 29, 2017, 7:06:32 PM (7 years ago)

Author:

bird

Message:

kmk_install: cleanups

File:

• trunk/src/kmk/kmkbuiltin/install.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/install.c ¶

@@ -97 +97 @@
 extern mode_t bsd_getmode(const void *bbox, mode_t omode);
 
-#ifndef __unused
-# define __unused
-#endif
-
 #ifndef MAXBSIZE
 # define MAXBSIZE 0x20000
@@ -150 +146 @@
 
 static int      copy(int, const char *, int *, const char *);
-static int      compare(int, const char *, size_t, int, const char *, size_t);
+static int      compare(int, size_t, int, size_t);
 static int      create_newfile(const char *, int, struct stat *);
 static int      create_tempfile(const char *, char *, size_t);
@@ -538 +534 @@
                         files_match = to_sb.st_size == 0;
                 else
-                        files_match = !(compare(from_fd, from_name,
-                            (size_t)from_sb.st_size, to_fd,
-                            to_name, (size_t)to_sb.st_size));
+                        files_match = !compare(from_fd, (size_t)from_sb.st_size,
+                                               to_fd, (size_t)to_sb.st_size);
 
                 /* Close "to" file unless we match. */
@@ -618 +613 @@
                 }
 
-                if (compare(temp_fd, tempfile, (size_t)temp_sb.st_size, to_fd,
-                            to_name, (size_t)to_sb.st_size) == 0) {
+                if (compare(temp_fd, (size_t)temp_sb.st_size,
+                            to_fd, (size_t)to_sb.st_size) == 0) {
                         /*
                          * If target has more than one link we need to
@@ -796 +791 @@
  */
 static int
-compare(int from_fd, const char *from_name __unused, size_t from_len,
-        int to_fd, const char *to_name __unused, size_t to_len)
+compare(int from_fd, size_t from_len, int to_fd, size_t to_len)
 {
         char buf1[MAXBSIZE];