From c4d8e64fab3658a87daa2356232e302e9037dc76 Mon Sep 17 00:00:00 2001 From: Ryo Nakamura Date: Wed, 13 Aug 2025 16:55:59 +0900 Subject: [PATCH] remove unnecessary code lines --- src/bwlimit.c | 2 -- src/fileops.c | 1 - src/main.c | 11 +---------- src/mscp.c | 2 +- src/print.c | 3 ++- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/bwlimit.c b/src/bwlimit.c index f51823d..f5fa64d 100644 --- a/src/bwlimit.c +++ b/src/bwlimit.c @@ -50,8 +50,6 @@ int bwlimit_init(struct bwlimit *bw, uint64_t bps, uint64_t win) #define timespeccmp(a, b, expr) \ ((a.tv_sec * 1000000000 + a.tv_nsec) expr(b.tv_sec * 1000000000 + b.tv_nsec)) -#include - int bwlimit_wait(struct bwlimit *bw, size_t nr_bytes) { struct timespec now, end, rq, rm; diff --git a/src/fileops.c b/src/fileops.c index 2c13436..f3270d8 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -101,7 +101,6 @@ MDIR *mscp_opendir_wrapped(const char *path) void mscp_closedir(MDIR *md) { - int ret; if (md->remote) sftp_closedir(md->remote); else diff --git a/src/main.c b/src/main.c index 06ac723..0ad58f1 100644 --- a/src/main.c +++ b/src/main.c @@ -117,8 +117,6 @@ char *split_user_host_path(const char *s, char **userp, char **hostp, char **pat return NULL; } - user = NULL; - host = NULL; path = tmp; for (cp = tmp; *cp; cp++) { if (*cp == '@' && (cp > tmp) && *(cp - 1) != '\\' && user == NULL) { @@ -211,7 +209,6 @@ struct target *validate_targets(char **arg, int len) pr_err("calloc: %s", strerrno()); return NULL; } - memset(t, 0, len * sizeof(struct target)); /* split remote:path into remote and path */ for (n = 0; n < len; n++) { @@ -309,7 +306,7 @@ long atol_with_unit(char *value, bool i) { /* value must be "\d+[kKmMgG]?" */ - char *u = value + (strlen(optarg) - 1); + char *u = value + (strlen(value) - 1); long k = i ? 1024 : 1000; long factor = 1; long v; @@ -359,7 +356,6 @@ int main(int argc, char **argv) struct mscp_ssh_opts s; struct mscp_opts o; struct target *t; - int pipe_fd[2]; int ch, n, i, ret; int direction = 0; char *remote = NULL, *checkpoint_save = NULL, *checkpoint_load = NULL; @@ -781,8 +777,6 @@ struct xfer_stat x; void print_stat(bool final) { struct mscp_stats s; - char buf[8192]; - int timeout; gettimeofday(&x.after, NULL); if (calculate_timedelta(&x.before, &x.after) > 1 || final) { @@ -798,9 +792,6 @@ void print_stat(bool final) void *print_stat_thread(void *arg) { - struct mscp_stats s; - char buf[8192]; - memset(&x, 0, sizeof(x)); gettimeofday(&x.start, NULL); x.before = x.start; diff --git a/src/mscp.c b/src/mscp.c index 8de7de4..8bb85e9 100644 --- a/src/mscp.c +++ b/src/mscp.c @@ -78,7 +78,7 @@ struct mscp { static int expand_coremask(const char *coremask, int **cores, int *nr_cores) { - int n, *core_list, core_list_len = 0, nr_usable, nr_all; + int n, *core_list, nr_usable, nr_all; char c[2] = { 'x', '\0' }; const char *_coremask; long v, needle; diff --git a/src/print.c b/src/print.c index 33fbf5d..20fac29 100644 --- a/src/print.c +++ b/src/print.c @@ -9,7 +9,8 @@ void set_print_severity(int serverity) { if (serverity < 0) __print_severity = -1; /* no print */ - __print_severity = serverity; + else + __print_severity = serverity; } int get_print_severity()