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

Prefer size_t over int, as casting can take extra instructions

Browse Source
This commit is contained in:
Rose
2023-05-03 15:17:40 -04:00
parent bbbaea5b2f
commit 459a49b1fe
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/eventlog/parse_json.c
View File

@@ -165,7 +165,7 @@ static char **
json_array_to_strvec(struct eventlog_json_object *array) json_array_to_strvec(struct eventlog_json_object *array)
{ {
struct json_item *item; struct json_item *item;
int len = 0; size_t len = 0;
char **ret; char **ret;
debug_decl(json_array_to_strvec, SUDO_DEBUG_UTIL); debug_decl(json_array_to_strvec, SUDO_DEBUG_UTIL);

4
lib/util/sudo_debug.c
View File

@@ -589,10 +589,10 @@ sudo_debug_exit_str_masked_v1(const char *func, const char *file, int line,
int subsys, const char *ret) int subsys, const char *ret)
{ {
static const char stars[] = "********************************************************************************"; static const char stars[] = "********************************************************************************";
int len = ret ? strlen(ret) : sizeof("(null)") - 1; size_t len = ret ? strlen(ret) : sizeof("(null)") - 1;
sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE, sudo_debug_printf2(NULL, NULL, 0, subsys | SUDO_DEBUG_TRACE,
"<- %s @ %s:%d := %.*s", func, file, line, len, ret ? stars : "(null)"); "<- %s @ %s:%zu := %.*s", func, file, line, len, ret ? stars : "(null)");
} }
void void

4
plugins/sudoers/fmtsudoers.c
View File

@@ -259,7 +259,7 @@ sudoers_format_cmndspec(struct sudo_lbuf *lbuf,
char buf[sizeof("CCYYMMDDHHMMSSZ")] = ""; char buf[sizeof("CCYYMMDDHHMMSSZ")] = "";
struct tm gmt; struct tm gmt;
if (gmtime_r(&cs->notbefore, &gmt) != NULL) { if (gmtime_r(&cs->notbefore, &gmt) != NULL) {
int len = strftime(buf, sizeof(buf), "%Y%m%d%H%M%SZ", &gmt); size_t len = strftime(buf, sizeof(buf), "%Y%m%d%H%M%SZ", &gmt);
if (len != 0 && buf[sizeof(buf) - 1] == '\0') if (len != 0 && buf[sizeof(buf) - 1] == '\0')
sudo_lbuf_append(lbuf, "NOTBEFORE=%s ", buf); sudo_lbuf_append(lbuf, "NOTBEFORE=%s ", buf);
} }
@@ -268,7 +268,7 @@ sudoers_format_cmndspec(struct sudo_lbuf *lbuf,
char buf[sizeof("CCYYMMDDHHMMSSZ")] = ""; char buf[sizeof("CCYYMMDDHHMMSSZ")] = "";
struct tm gmt; struct tm gmt;
if (gmtime_r(&cs->notafter, &gmt) != NULL) { if (gmtime_r(&cs->notafter, &gmt) != NULL) {
int len = strftime(buf, sizeof(buf), "%Y%m%d%H%M%SZ", &gmt); size_t len = strftime(buf, sizeof(buf), "%Y%m%d%H%M%SZ", &gmt);
if (len != 0 && buf[sizeof(buf) - 1] == '\0') if (len != 0 && buf[sizeof(buf) - 1] == '\0')
sudo_lbuf_append(lbuf, "NOTAFTER=%s ", buf); sudo_lbuf_append(lbuf, "NOTAFTER=%s ", buf);
} }