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

16
lib/util/lbuf.c
View File

@@ -220,7 +220,7 @@ sudo_lbuf_append_quoted_v1(struct sudo_lbuf *lbuf, const char *set, const char *
bool ret = false;
const char *cp, *s;
va_list ap;
int len;
unsigned int len;
debug_decl(sudo_lbuf_append_quoted, SUDO_DEBUG_UTIL);
if (sudo_lbuf_error(lbuf))
@@ -358,11 +358,11 @@ done:
/* XXX - check output function return value */
static void
sudo_lbuf_println(struct sudo_lbuf *lbuf, char *line, int len)
sudo_lbuf_println(struct sudo_lbuf *lbuf, char *line, size_t len)
{
char *cp, save;
int i, have, contlen = 0;
int indent = lbuf->indent;
size_t i, have, contlen = 0;
unsigned int indent = lbuf->indent;
bool is_comment = false;
debug_decl(sudo_lbuf_println, SUDO_DEBUG_UTIL);
@@ -382,14 +382,14 @@ sudo_lbuf_println(struct sudo_lbuf *lbuf, char *line, int len)
have = lbuf->cols;
while (cp != NULL && *cp != '\0') {
char *ep = NULL;
int need = len - (int)(cp - line);
size_t need = len - (cp - line);
if (need > have) {
have -= contlen; /* subtract for continuation char */
if ((ep = memrchr(cp, ' ', have)) == NULL)
ep = memchr(cp + have, ' ', need - have);
if (ep != NULL)
need = (int)(ep - cp);
need = (ep - cp);
}
if (cp != line) {
if (is_comment) {
@@ -436,7 +436,7 @@ void
sudo_lbuf_print_v1(struct sudo_lbuf *lbuf)
{
char *cp, *ep;
int len;
size_t len;
debug_decl(sudo_lbuf_print, SUDO_DEBUG_UTIL);
if (lbuf->buf == NULL || lbuf->len == 0)
@@ -460,7 +460,7 @@ sudo_lbuf_print_v1(struct sudo_lbuf *lbuf)
} else {
len = lbuf->len - (cp - lbuf->buf);
if ((ep = memchr(cp, '\n', len)) != NULL)
len = (int)(ep - cp);
len = (size_t)(ep - cp);
if (len)
sudo_lbuf_println(lbuf, cp, len);
cp = ep ? ep + 1 : NULL;