diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 1230c9aa0..9a4a1c336 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -2325,7 +2325,7 @@ int lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s, int exc int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv) { - int r = 1; + int r; if (!lv) { r = dm_mknodes(NULL); diff --git a/lib/display/display.c b/lib/display/display.c index cfd83c91a..6cdd07b8b 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -113,7 +113,7 @@ static const char *_display_size(const struct cmd_context *cmd, { unsigned base = BASE_UNKNOWN; unsigned s; - int suffix = 1, precision; + int suffix, precision; uint64_t byte = UINT64_C(0); uint64_t units = UINT64_C(1024); char *size_buf = NULL; diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c index 8070014c7..0a11262f7 100644 --- a/lib/locking/cluster_locking.c +++ b/lib/locking/cluster_locking.c @@ -419,7 +419,7 @@ static int _lock_resource(struct cmd_context *cmd, const char *resource, char lockname[PATH_MAX]; int clvmd_cmd = 0; const char *lock_scope; - const char *lock_type = ""; + const char *lock_type; assert(strlen(resource) < sizeof(lockname)); assert(resource); diff --git a/lib/misc/lvm-flock.c b/lib/misc/lvm-flock.c index 8b70a0cae..252fec3fe 100644 --- a/lib/misc/lvm-flock.c +++ b/lib/misc/lvm-flock.c @@ -93,7 +93,7 @@ void release_flocks(int unlock) static int _do_flock(const char *file, int *fd, int operation, uint32_t nonblock) { - int r = 1; + int r; int old_errno; struct stat buf1, buf2; diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index 3b390a3f7..a8afcc1de 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -205,7 +205,7 @@ out: static int _open_socket(daemon_state s) { - int fd = -1; + int fd; int file_created = 0; struct sockaddr_un sockaddr = { .sun_family = AF_UNIX }; struct stat buf; diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c index 9363a9281..155ac6010 100644 --- a/libdm/libdm-report.c +++ b/libdm/libdm-report.c @@ -1278,7 +1278,7 @@ static int _cmp_field_string_list_subset_all(const struct str_list_sort_value *v const struct selection_str_list *sel) { struct dm_str_list *sel_item; - unsigned int i = 1, last_found = 1;; + unsigned int i, last_found = 1;; int r = 0; /* if value has no items and selection has at leas one, it's clear there's no match */ diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 8f64bfce6..6cbd21c33 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -897,7 +897,7 @@ static int _setgeometry(CMD_ARGS) static int _splitname(CMD_ARGS) { struct dmsetup_report_obj obj; - int r = 1; + int r; obj.task = NULL; obj.info = NULL;