mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-03-03 21:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

u/debug: Do not save pointer returned from getenv

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-06-17 20:17:12 +01:00
parent 8c8356840a
commit 9a8d80c14d
2 changed files with 44 additions and 17 deletions
src/xrt/auxiliary/util
u_debug.cu_debug.h

47
src/xrt/auxiliary/util/u_debug.c
View file

@ -18,7 +18,6 @@
#include <ctype.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
@ -33,9 +32,16 @@ DEBUG_GET_ONCE_BOOL_OPTION(print, "XRT_PRINT_OPTIONS", false)
*/
static const char *
os_getenv(const char *name)
get_option_raw(char *chars, size_t char_count, const char *name)
{
return getenv(name);
const char *raw = getenv(name);
if (raw == NULL) {
return NULL;
} else {
snprintf(chars, char_count, "%s", raw);
return chars;
}
}
static const char *
@ -211,15 +217,16 @@ debug_string_to_log_level(const char *string, enum u_logging_level _default)
*/
const char *
debug_get_option(const char *name, const char *_default)
debug_get_option(char *chars, size_t char_count, const char *name, const char *_default)
{
const char *raw = os_getenv(name);
const char *ret;
const char *raw = get_option_raw(chars, char_count, name);
const char *ret = raw;
if (raw == NULL) {
ret = _default;
} else {
ret = raw;
if (ret == NULL) {
if (_default != NULL) {
snprintf(chars, char_count, "%s", _default);
ret = chars; // Return a value.
}
}
if (debug_get_bool_option_print()) {
@ -232,7 +239,9 @@ debug_get_option(const char *name, const char *_default)
bool
debug_get_bool_option(const char *name, bool _default)
{
const char *raw = os_getenv(name);
char chars[DEBUG_CHAR_STORAGE_SIZE];
const char *raw = get_option_raw(chars, ARRAY_SIZE(chars), name);
bool ret = raw == NULL ? _default : debug_string_to_bool(raw);
if (debug_get_bool_option_print()) {
@ -245,7 +254,9 @@ debug_get_bool_option(const char *name, bool _default)
enum debug_tristate_option
debug_get_tristate_option(const char *name)
{
const char *raw = os_getenv(name);
char chars[DEBUG_CHAR_STORAGE_SIZE];
const char *raw = get_option_raw(chars, ARRAY_SIZE(chars), name);
enum debug_tristate_option ret = debug_string_to_tristate(raw);
if (debug_get_bool_option_print()) {
@ -259,7 +270,9 @@ debug_get_tristate_option(const char *name)
long
debug_get_num_option(const char *name, long _default)
{
const char *raw = os_getenv(name);
char chars[DEBUG_CHAR_STORAGE_SIZE];
const char *raw = get_option_raw(chars, ARRAY_SIZE(chars), name);
long ret = debug_string_to_num(raw, _default);
if (debug_get_bool_option_print()) {
@ -272,7 +285,9 @@ debug_get_num_option(const char *name, long _default)
float
debug_get_float_option(const char *name, float _default)
{
const char *raw = os_getenv(name);
char chars[DEBUG_CHAR_STORAGE_SIZE];
const char *raw = get_option_raw(chars, ARRAY_SIZE(chars), name);
float ret = debug_string_to_float(raw, _default);
if (debug_get_bool_option_print()) {
@ -285,7 +300,9 @@ debug_get_float_option(const char *name, float _default)
enum u_logging_level
debug_get_log_option(const char *name, enum u_logging_level _default)
{
const char *raw = os_getenv(name);
char chars[DEBUG_CHAR_STORAGE_SIZE];
const char *raw = get_option_raw(chars, ARRAY_SIZE(chars), name);
enum u_logging_level ret = debug_string_to_log_level(raw, _default);
if (debug_get_bool_option_print()) {

14
src/xrt/auxiliary/util/u_debug.h
View file

@ -19,6 +19,15 @@
extern "C" {
#endif
/*
*
* Definitions.
*
*/
#define DEBUG_CHAR_STORAGE_SIZE (1024)
enum debug_tristate_option
{
DEBUG_TRISTATE_OFF,
@ -56,7 +65,7 @@ debug_string_to_log_level(const char *string, enum u_logging_level _default);
*/
const char *
debug_get_option(const char *name, const char *_default);
debug_get_option(char *chars, size_t char_count, const char *name, const char *_default);
bool
debug_get_bool_option(const char *name, bool _default);
@ -86,11 +95,12 @@ debug_get_log_option(const char *name, enum u_logging_level _default);
#define DEBUG_GET_ONCE_OPTION(suffix, name, _default) \
static const char *debug_get_option_##suffix(void) \
{ \
static char storage[DEBUG_CHAR_STORAGE_SIZE]; \
static bool gotten = false; \
static const char *stored; \
if (!gotten) { \
gotten = true; \
stored = debug_get_option(name, _default); \
stored = debug_get_option(storage, ARRAY_SIZE(storage), name, _default); \
} \
return stored; \
}