mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-26 04:10:09 +01:00
623ff4ec42
move include so va_list will be picked up via stdarg.h
In file included from ../src/util/u_printf.cpp:24:
../src/util/u_printf.h:43:41: error: unknown type name 'va_list'; did you mean '__va_list'?
size_t u_printf_length(const char *fmt, va_list untouched_args);
^~~~~~~
__va_list
/usr/include/machine/_types.h:126:27: note: '__va_list' declared here
typedef __builtin_va_list __va_list;
^
and add includes to u_printf.h as suggested by Ilia Mirkin
stdarg.h for va_list and stddef.h for size_t
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13448>
96 lines
2.8 KiB
C++
96 lines
2.8 KiB
C++
//
|
|
// Copyright 2020 Serge Martin
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
|
// copy of this software and associated documentation files (the "Software"),
|
|
// to deal in the Software without restriction, including without limitation
|
|
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
// and/or sell copies of the Software, and to permit persons to whom the
|
|
// Software is furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
// OTHER DEALINGS IN THE SOFTWARE.
|
|
//
|
|
// Extract from Serge's printf clover code by airlied.
|
|
|
|
#include <assert.h>
|
|
#include <stdarg.h>
|
|
#include "u_printf.h"
|
|
#include "util/macros.h"
|
|
|
|
/* Some versions of MinGW are missing _vscprintf's declaration, although they
|
|
* still provide the symbol in the import library. */
|
|
#ifdef __MINGW32__
|
|
_CRTIMP int _vscprintf(const char *format, va_list argptr);
|
|
#endif
|
|
|
|
#ifndef va_copy
|
|
#ifdef __va_copy
|
|
#define va_copy(dest, src) __va_copy((dest), (src))
|
|
#else
|
|
#define va_copy(dest, src) (dest) = (src)
|
|
#endif
|
|
#endif
|
|
|
|
size_t util_printf_next_spec_pos(const std::string &s, size_t pos)
|
|
{
|
|
size_t next_tok, spec_pos;
|
|
do {
|
|
pos = s.find_first_of('%', pos);
|
|
|
|
if (pos == std::string::npos)
|
|
return -1;
|
|
|
|
if (s[pos + 1] == '%') {
|
|
pos += 2;
|
|
continue;
|
|
}
|
|
|
|
next_tok = s.find_first_of('%', pos + 1);
|
|
spec_pos = s.find_first_of("cdieEfFgGaAosuxXp", pos + 1);
|
|
if (spec_pos != std::string::npos)
|
|
if (spec_pos < next_tok)
|
|
return spec_pos;
|
|
|
|
pos++;
|
|
} while (1);
|
|
}
|
|
|
|
size_t util_printf_next_spec_pos(const char *str, size_t pos)
|
|
{
|
|
return util_printf_next_spec_pos(std::string(str), pos);
|
|
}
|
|
|
|
size_t
|
|
u_printf_length(const char *fmt, va_list untouched_args)
|
|
{
|
|
int size;
|
|
char junk;
|
|
|
|
/* Make a copy of the va_list so the original caller can still use it */
|
|
va_list args;
|
|
va_copy(args, untouched_args);
|
|
|
|
#ifdef _WIN32
|
|
/* We need to use _vcsprintf to calculate the size as vsnprintf returns -1
|
|
* if the number of characters to write is greater than count.
|
|
*/
|
|
size = _vscprintf(fmt, args);
|
|
(void)junk;
|
|
#else
|
|
size = vsnprintf(&junk, 1, fmt, args);
|
|
#endif
|
|
assert(size >= 0);
|
|
|
|
va_end(args);
|
|
|
|
return size;
|
|
}
|