diff options
| -rw-r--r-- | lib/mbsedit.c | 3 | ||||
| -rw-r--r-- | misc-utils/findmnt-verify.c | 3 | ||||
| -rw-r--r-- | sys-utils/hwclock.c | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/lib/mbsedit.c b/lib/mbsedit.c index d464358fc..e028c496d 100644 --- a/lib/mbsedit.c +++ b/lib/mbsedit.c @@ -151,7 +151,7 @@ static size_t mbs_insert(char *str, wint_t c, size_t *ncells) { /* all in bytes! */ size_t n = 1, bytes; - char *in = (char *) &c; + char *in; #ifdef HAVE_WIDECHAR wchar_t wc = (wchar_t) c; @@ -162,6 +162,7 @@ static size_t mbs_insert(char *str, wint_t c, size_t *ncells) in = in_buf; #else *ncells = 1; + in = (char *) &c; #endif bytes = strlen(str); diff --git a/misc-utils/findmnt-verify.c b/misc-utils/findmnt-verify.c index b32901d66..1cc62def9 100644 --- a/misc-utils/findmnt-verify.c +++ b/misc-utils/findmnt-verify.c @@ -126,14 +126,13 @@ done: static int verify_target(struct verify_context *vfy) { const char *tgt = mnt_fs_get_target(vfy->fs); - const char *cn = tgt; struct stat sb; if (!tgt) return verify_err(vfy, _("undefined target (fs_file)")); if (!(flags & FL_NOCACHE)) { - cn = mnt_resolve_target(tgt, cache); + const char *cn = mnt_resolve_target(tgt, cache); if (!cn) return -ENOMEM; if (strcmp(cn, tgt) != 0) diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index 98ee5bef5..2f2c03a6f 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -1457,10 +1457,7 @@ int main(int argc, char **argv) } } - argc -= optind; - argv += optind; - - if (argc > 0) { + if (argc > optind) { warnx(_("%d too many arguments given"), argc); errtryhelp(EXIT_FAILURE); } |