From bd6abc4939621c455f931905f0530115eb8c443c Mon Sep 17 00:00:00 2001
From: "J.W. Schultz" <jw@samba.org>
Date: Tue, 3 Feb 2004 03:42:49 +0000
Subject: [PATCH] Corrected sizeof usage: 	sizeof obj 	sizeof (type)

---
 flist.c    | 25 ++++++++++++++-----------
 receiver.c |  4 ++--
 sender.c   |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/flist.c b/flist.c
index 60a0e8df..a9bfb551 100644
--- a/flist.c
+++ b/flist.c
@@ -297,10 +297,9 @@ static void flist_expand(struct file_list *flist)
 
 		if (verbose >= 2) {
 			rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
-				who_am_i(),
-				(double)sizeof(flist->files[0])
-				* flist->malloced,
-				(new_ptr == flist->files) ? " not" : "");
+			    who_am_i(),
+			    (double) sizeof flist->files[0] * flist->malloced,
+			    (new_ptr == flist->files) ? " not" : "");
 		}
 
 		flist->files = (struct file_struct **) new_ptr;
@@ -809,14 +808,18 @@ struct file_struct *make_file(char *fname, int exclude_level)
 	linkname_len = 0;
 #endif
 
+	idev_len = 0;
 #if SUPPORT_HARD_LINKS
-	if (preserve_hard_links) {
-		idev_len = (protocol_version < 28 ? S_ISREG(st.st_mode)
-			  : !S_ISDIR(st.st_mode) && st.st_nlink > 1)
-			 ? sizeof (struct idev) : 0;
-	} else
+	if (preserve_hard_links && st.st_nlink > 1) {
+		if (protocol_version < 28) {
+			if (S_ISREG(st.st_mode))
+				idev_len = sizeof (struct idev);
+		} else {
+			if (!S_ISDIR(st.st_mode))
+				idev_len = sizeof (struct idev);
+		}
+	}
 #endif
-		idev_len = 0;
 
 	sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 0;
 	file_struct_len = idev_len? sizeof file[0] : min_file_struct_len;
@@ -1377,7 +1380,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		return;
 
 	qsort(flist->files, flist->count,
-	      sizeof(flist->files[0]), (int (*)()) file_compare);
+	      sizeof flist->files[0], (int (*)()) file_compare);
 
 	for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
 		if (flist->files[i]->basename) {
diff --git a/receiver.c b/receiver.c
index 71897a94..da89819a 100644
--- a/receiver.c
+++ b/receiver.c
@@ -411,7 +411,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 			continue;
 		}
 
-		strlcpy(template, fnametmp, sizeof(template));
+		strlcpy(template, fnametmp, sizeof template);
 
 		/* we initially set the perms without the
 		 * setuid/setgid bits to ensure that there is no race
@@ -426,7 +426,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 		 * transferred, but that may not be the case with -R */
 		if (fd2 == -1 && relative_paths && errno == ENOENT &&
 		    create_directory_path(fnametmp, orig_umask) == 0) {
-			strlcpy(fnametmp, template, sizeof(fnametmp));
+			strlcpy(fnametmp, template, sizeof fnametmp);
 			fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
 		}
 		if (fd2 == -1) {
diff --git a/sender.c b/sender.c
index d103b9a2..e73ae62f 100644
--- a/sender.c
+++ b/sender.c
@@ -229,7 +229,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			write_int(f_out, i);
 
 			if (write_batch)
-				write_batch_delta_file((char *)&i, sizeof(i));
+				write_batch_delta_file((char *)&i, sizeof i);
 
 			write_sum_head(f_out, s);
 		}
-- 
2.34.1