isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid compiler casting warnings by assigning to the same type where possible

Browse Source 
This saves instructions that are related to casting as well as compiler warnings.
This commit is contained in:
Rose
2023-05-18 14:38:18 -04:00
parent a0b074cc9c
commit e54ba33ea0
50 changed files with 175 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/conversation.c
View File

@@ -140,7 +140,7 @@ err:
continue;
freezero(repl->reply, strlen(repl->reply));
repl->reply = NULL;
} while (n--);
} while (n-- > 0);
}
sudo_debug_set_active_instance(conv_debug_instance);
@@ -179,12 +179,17 @@ sudo_conversation_printf(int msg_type, const char *fmt, ...)
FALLTHROUGH;
case SUDO_CONV_INFO_MSG:
/* Convert nl -> cr nl in case tty is in raw mode. */
len = strlen(fmt);
if (sudo_term_is_raw(fileno(ttyfp ? ttyfp : fp))) {
if (len < ssizeof(fmt2) && len > 0 && fmt[len - 1] == '\n') {
if (len == 1 || fmt[len - 2] != '\r') {
memcpy(fmt2, fmt, len - 1);
fmt2[len - 1] = '\0';
size_t fmtlen = strlen(fmt);
if (fmtlen < sizeof(fmt2) && fmtlen && fmt[fmtlen - 1] == '\n') {
if (fmtlen == 1) {
fmt2[0] = '\0';
fmt = fmt2;
crnl = "\r\n";
}
else if (fmt[fmtlen - 2] != '\r') {
memcpy(fmt2, fmt, fmtlen - 1);
fmt2[fmtlen - 1] = '\0';
fmt = fmt2;
crnl = "\r\n";
}