Commit bd6abc49 authored by J.W. Schultz's avatar J.W. Schultz

Corrected sizeof usage:

	sizeof obj
	sizeof (type)
parent 96eeda03
...@@ -298,8 +298,7 @@ static void flist_expand(struct file_list *flist) ...@@ -298,8 +298,7 @@ static void flist_expand(struct file_list *flist)
if (verbose >= 2) { if (verbose >= 2) {
rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n", rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
who_am_i(), who_am_i(),
(double)sizeof(flist->files[0]) (double) sizeof flist->files[0] * flist->malloced,
* flist->malloced,
(new_ptr == flist->files) ? " not" : ""); (new_ptr == flist->files) ? " not" : "");
} }
...@@ -809,14 +808,18 @@ struct file_struct *make_file(char *fname, int exclude_level) ...@@ -809,14 +808,18 @@ struct file_struct *make_file(char *fname, int exclude_level)
linkname_len = 0; linkname_len = 0;
#endif #endif
idev_len = 0;
#if SUPPORT_HARD_LINKS #if SUPPORT_HARD_LINKS
if (preserve_hard_links) { if (preserve_hard_links && st.st_nlink > 1) {
idev_len = (protocol_version < 28 ? S_ISREG(st.st_mode) if (protocol_version < 28) {
: !S_ISDIR(st.st_mode) && st.st_nlink > 1) if (S_ISREG(st.st_mode))
? sizeof (struct idev) : 0; idev_len = sizeof (struct idev);
} else } else {
if (!S_ISDIR(st.st_mode))
idev_len = sizeof (struct idev);
}
}
#endif #endif
idev_len = 0;
sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 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; 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) ...@@ -1377,7 +1380,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
return; return;
qsort(flist->files, flist->count, 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++) { for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
if (flist->files[i]->basename) { if (flist->files[i]->basename) {
......
...@@ -411,7 +411,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name) ...@@ -411,7 +411,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
continue; continue;
} }
strlcpy(template, fnametmp, sizeof(template)); strlcpy(template, fnametmp, sizeof template);
/* we initially set the perms without the /* we initially set the perms without the
* setuid/setgid bits to ensure that there is no race * 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) ...@@ -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 */ * transferred, but that may not be the case with -R */
if (fd2 == -1 && relative_paths && errno == ENOENT && if (fd2 == -1 && relative_paths && errno == ENOENT &&
create_directory_path(fnametmp, orig_umask) == 0) { create_directory_path(fnametmp, orig_umask) == 0) {
strlcpy(fnametmp, template, sizeof(fnametmp)); strlcpy(fnametmp, template, sizeof fnametmp);
fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS); fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
} }
if (fd2 == -1) { if (fd2 == -1) {
......
...@@ -229,7 +229,7 @@ void send_files(struct file_list *flist, int f_out, int f_in) ...@@ -229,7 +229,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
write_int(f_out, i); write_int(f_out, i);
if (write_batch) 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); write_sum_head(f_out, s);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment