The branch, master has been updated
via 3c56896d Simplify a variable.
via deb8353d Yes, we know we're discarding a return value.
from 73053f26 Simple change to recv_token().
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3c56896d2153148da2c3ac876b725968044a815f
Author: Wayne Davison <wa...@opencoder.net>
Date: Fri Jun 19 11:07:02 2020 -0700
Simplify a variable.
commit deb8353d2cbb8047e1d0a8bc93b8704d9cd70b66
Author: Wayne Davison <wa...@opencoder.net>
Date: Fri Jun 19 10:56:28 2020 -0700
Yes, we know we're discarding a return value.
-----------------------------------------------------------------------
Summary of changes:
clientserver.c | 13 ++++++-------
uidlist.c | 6 +++---
2 files changed, 9 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/clientserver.c b/clientserver.c
index fa7d47aa..b9325186 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -394,7 +394,7 @@ void set_env_num(const char *var, long num)
/* Used for both early exec & pre-xfer exec */
static pid_t start_pre_exec(const char *cmd, int *arg_fd_ptr, int
*error_fd_ptr)
{
- int arg_fds[2], error_fds[2], arg_fd, error_fd;
+ int arg_fds[2], error_fds[2], arg_fd;
pid_t pid;
if ((error_fd_ptr && pipe(error_fds) < 0) || (arg_fd_ptr &&
pipe(arg_fds) < 0) || (pid = fork()) < 0)
@@ -406,8 +406,7 @@ static pid_t start_pre_exec(const char *cmd, int
*arg_fd_ptr, int *error_fd_ptr)
if (error_fd_ptr) {
close(error_fds[0]);
- error_fd = error_fds[1];
- set_blocking(error_fd);
+ set_blocking(error_fds[1]);
}
if (arg_fd_ptr) {
@@ -436,8 +435,8 @@ static pid_t start_pre_exec(const char *cmd, int
*arg_fd_ptr, int *error_fd_ptr)
if (error_fd_ptr) {
close(STDIN_FILENO);
- dup2(error_fd, STDOUT_FILENO);
- close(error_fd);
+ dup2(error_fds[1], STDOUT_FILENO);
+ close(error_fds[1]);
}
status = shell_exec(cmd);
@@ -449,8 +448,8 @@ static pid_t start_pre_exec(const char *cmd, int
*arg_fd_ptr, int *error_fd_ptr)
if (error_fd_ptr) {
close(error_fds[1]);
- error_fd = *error_fd_ptr = error_fds[0];
- set_blocking(error_fd);
+ *error_fd_ptr = error_fds[0];
+ set_blocking(error_fds[0]);
}
if (arg_fd_ptr) {
diff --git a/uidlist.c b/uidlist.c
index 91fa8553..739286a4 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -527,14 +527,14 @@ const char *getallgroups(uid_t uid, item_list *gid_list)
return "getpwuid failed";
gid_list->count = 0; /* We're overwriting any items in the list */
- EXPAND_ITEM_LIST(gid_list, gid_t, 32);
+ (void)EXPAND_ITEM_LIST(gid_list, gid_t, 32);
size = gid_list->malloced;
/* Get all the process's groups, with the pw_gid group first. */
if (getgrouplist(pw->pw_name, pw->pw_gid, gid_list->items, &size) < 0) {
if (size > (int)gid_list->malloced) {
gid_list->count = gid_list->malloced;
- EXPAND_ITEM_LIST(gid_list, gid_t, size);
+ (void)EXPAND_ITEM_LIST(gid_list, gid_t, size);
if (getgrouplist(pw->pw_name, pw->pw_gid,
gid_list->items, &size) < 0)
size = -1;
} else
@@ -553,7 +553,7 @@ const char *getallgroups(uid_t uid, item_list *gid_list)
break;
}
if (j == size) { /* The default group wasn't found! */
- EXPAND_ITEM_LIST(gid_list, gid_t, size+1);
+ (void)EXPAND_ITEM_LIST(gid_list, gid_t, size+1);
gid_array = gid_list->items;
}
gid_array[j] = gid_array[0];
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
