mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Use common helper versions of truncating Xprintf

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-06-14 16:33:54 +01:00 committed by Ryan Pavlik
parent b33e65698a
commit e466551db0
1 changed files with 7 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/xrt/state_trackers/oxr/oxr_logger.c
View file

@ -1,4 +1,4 @@
// Copyright 2018-2022, Collabora, Ltd. // Copyright 2018-2023, Collabora, Ltd.
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0
/*! /*!
* @file * @file
@ -11,6 +11,7 @@
#include "util/u_misc.h" #include "util/u_misc.h"
#include "util/u_debug.h" #include "util/u_debug.h"
#include "util/u_truncate_printf.h"
#include "oxr_objects.h" #include "oxr_objects.h"
#include "oxr_logger.h" #include "oxr_logger.h"
@ -59,58 +60,6 @@ is_fmt_func_arg_start(const char *fmt)
return false; return false;
} }
/*!
* We want to truncate the value, not get the possible written.
*
* There are no version of the *many* Windows versions of this functions that
* truncates and returns the number of bytes written (not including null).
*/
static int
truncate_vsnprintf(char *chars, size_t char_count, const char *fmt, va_list args)
{
/*
* We always want to be able to write null terminator, and
* something propbly went wrong if char_count larger then INT_MAX.
*/
if (char_count == 0 || char_count > INT_MAX) {
return -1;
}
// Will always be able to write null terminator.
int ret = vsnprintf(chars, char_count, fmt, args);
if (ret < 0) {
return ret;
}
// Safe, ret is checked for negative above.
if ((size_t)ret > char_count - 1) {
return (int)char_count - 1;
}
return ret;
}
/*!
* We want to truncate the value, not get the possible written.
*/
static int
truncate_snprintf(char *chars, size_t char_count, const char *fmt, ...)
{
/*
* We always want to be able to write null terminator, and
* something propbly went wrong if char_count larger then INT_MAX.
*/
if (char_count == 0 || char_count > INT_MAX) {
return -1;
}
va_list args;
va_start(args, fmt);
int ret = truncate_vsnprintf(chars, char_count, fmt, args);
va_end(args);
return ret;
}
/*! /*!
* Prints the first part of a logging message, has three forms. * Prints the first part of a logging message, has three forms.
* *
@ -130,12 +79,12 @@ print_prefix(struct oxr_logger *logger, const char *fmt, const char *prefix, cha
{ {
if (logger->api_func_name != NULL) { if (logger->api_func_name != NULL) {
if (is_fmt_func_arg_start(fmt)) { if (is_fmt_func_arg_start(fmt)) {
return truncate_snprintf(buf, remaining, "%s: %s", prefix, logger->api_func_name); return u_truncate_snprintf(buf, remaining, "%s: %s", prefix, logger->api_func_name);
} else { } else {
return truncate_snprintf(buf, remaining, "%s in %s: ", prefix, logger->api_func_name); return u_truncate_snprintf(buf, remaining, "%s in %s: ", prefix, logger->api_func_name);
} }
} else { } else {
return truncate_snprintf(buf, remaining, "%s: ", prefix); return u_truncate_snprintf(buf, remaining, "%s: ", prefix);
} }
} }
@ -169,7 +118,7 @@ do_print(struct oxr_logger *logger, const char *fmt, const char *prefix, va_list
} }
printed += ret; printed += ret;
ret = truncate_vsnprintf(buf + printed, remaining - printed, fmt, args); ret = u_truncate_vsnprintf(buf + printed, remaining - printed, fmt, args);
if (ret < 0) { if (ret < 0) {
U_LOG_E("Internal OpenXR logging error!"); U_LOG_E("Internal OpenXR logging error!");
return; return;
@ -187,7 +136,7 @@ static void
do_print_func(const char *api_func_name) do_print_func(const char *api_func_name)
{ {
char buf[LOG_BUFFER_SIZE]; char buf[LOG_BUFFER_SIZE];
truncate_snprintf(buf, sizeof(buf), "%s\n", api_func_name); u_truncate_snprintf(buf, sizeof(buf), "%s\n", api_func_name);
do_output(buf); do_output(buf);
} }