libarchive: Fix var decl after statement in archive_string.c
When HAVE_MBRTOWC is true we declare an extra local variable. Move the unused argument cast to the end of the invalid_mbs function.
This commit is contained in:
parent
e1afd072bc
commit
680fc0eda8
@ -2287,7 +2287,6 @@ invalid_mbs(const void *_p, size_t n, struct archive_string_conv *sc)
|
|||||||
const char *p = (const char *)_p;
|
const char *p = (const char *)_p;
|
||||||
size_t r;
|
size_t r;
|
||||||
|
|
||||||
(void)sc; /* UNUSED */
|
|
||||||
#if HAVE_MBRTOWC
|
#if HAVE_MBRTOWC
|
||||||
mbstate_t shift_state;
|
mbstate_t shift_state;
|
||||||
|
|
||||||
@ -2311,6 +2310,7 @@ invalid_mbs(const void *_p, size_t n, struct archive_string_conv *sc)
|
|||||||
p += r;
|
p += r;
|
||||||
n -= r;
|
n -= r;
|
||||||
}
|
}
|
||||||
|
(void)sc; /* UNUSED */
|
||||||
return (0); /* All Okey. */
|
return (0); /* All Okey. */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user