Rename stuff.

1 files changed, 16 insertions, 17 deletions

diff --git a/main.c b/main.c
index 5f1f602..2b724c4 100644
--- a/main.c
+++ b/main.c
@@ -34,10 +34,10 @@ static inline void init(int argc, char *argv[]);
 static inline void status(int argc, char *argv[]);
 static inline void add(int argc, char *argv[]);
 
-static inline void init_stg_area(void);
-static inline int cmp_links(const char *link1, const char *link2);
-static inline int cmp_files(const char *file1, const char *file2);
+static inline int cmplink(const char *link1, const char *link2);
+static inline int cmpfile(const char *file1, const char *file2);
 
+static inline void stage_init(void);
 static inline void stage_entry(const char *path, char kind, int islnk);
 static inline void print_status(const char *file, char kind, int islnk);
 
@@ -49,9 +49,9 @@ static inline void mklink(const char *src, const char obj[HASH_LEN]);
 
 static inline void mkdirs(const char *path);
 static inline void copy_link(const char *src);
-static inline int copy_file(const char *src, const char *dst);
+static inline void copy_file(const char *src, const char *dst);
 
-static inline int linklen(const char *lnk);
+static inline int lnklen(const char *lnk);
 static inline void concat(char *dst, size_t n, const char *arg1, ...);
 
 static inline void *_xmalloc(size_t s, const char *file, int line);
@@ -125,7 +125,7 @@ static inline void add(int argc, char *argv[])
 	if (argc < 2)
 		errx(1, "Usage: %s [<files>]", argv[0]);
 
-	init_stg_area();
+	stage_init();
 	scan_res_cb = stage_entry;
 
 	for (i = 1; i < argc; i++) {
@@ -176,10 +176,10 @@ int scan_head(const char * path, const struct stat *sb, int flag,
 			return 0; // no change
 
 		if (S_ISREG(wt_stat.st_mode)) {
-			if (cmp_files(path, wt_path) == 1)
+			if (cmpfile(path, wt_path) == 1)
 				scan_res_cb(wt_path, KIND_MOD, 0);
 		} else if (S_ISLNK(wt_stat.st_mode)) {
-			if (cmp_links(path, wt_path) == 1)
+			if (cmplink(path, wt_path) == 1)
 				scan_res_cb(wt_path, KIND_MOD, 1);
 		}
 	}
@@ -207,7 +207,7 @@ static inline int scan_tree(const char * path, const struct stat *st,
 	return 0;
 }
 
-static inline int cmp_files(const char *file1, const char *file2)
+static inline int cmpfile(const char *file1, const char *file2)
 {
 	int rc;
 	int fd1, fd2;
@@ -236,16 +236,16 @@ static inline int cmp_files(const char *file1, const char *file2)
 	return rc;
 }
 
-static inline int cmp_links(const char *link1, const char *link2)
+static inline int cmplink(const char *link1, const char *link2)
 {
 	ssize_t len1, len2; 
 	int buflen1, buflen2;
 	
-	buflen1 = linklen(link1);
+	buflen1 = lnklen(link1);
 	char buf1[buflen1];
 	len1 = readlink(link1, buf1, sizeof(buf1) - 1);
 
-	buflen2 = linklen(link2);
+	buflen2 = lnklen(link2);
 	char buf2[buflen2];
 	len2 = readlink(link2, buf2, sizeof(buf2) - 1);
 	
@@ -261,7 +261,7 @@ static inline int cmp_links(const char *link1, const char *link2)
 	return strcmp(buf1, buf2);
 }
 
-static inline void init_stg_area(void)
+static inline void stage_init(void)
 {
 	pid_t rm_pid, cp_pid;
 
@@ -341,7 +341,7 @@ static inline void print_status(const char *file, char kind, int islnk)
 	printf("[%c] %s\n", kind, file);
 }
 
-static inline int linklen(const char *lnk)
+static inline int lnklen(const char *lnk)
 {
 	int len;
 	struct stat st;
@@ -420,7 +420,7 @@ static inline int diff(const char *file1, const char *file2)
 	err(1, "fork");
 }
 
-static inline int copy_file(const char *src, const char *dst)
+static inline void copy_file(const char *src, const char *dst)
 {
 	int fdin, fdout;
 	struct stat st;
@@ -463,7 +463,6 @@ static inline int copy_file(const char *src, const char *dst)
 
 	close(fdin);
 	close(fdout);
-	return (nread < 0) ? -1 : 0;
 }
 
 static inline void copy_link(const char *src)
@@ -471,7 +470,7 @@ static inline void copy_link(const char *src)
 	int len;
 	ssize_t n;
 
-	len = linklen(src);
+	len = lnklen(src);
 	char target[len];
 	n = readlink(src, target, len);
 	if (n == -1)