OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno/rnn: drop custom aprintf function

Browse Source 
Replace custom apritnf() function with the existing asprintf(), which is
already widely used by rnn.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28193>
This commit is contained in:
Dmitry Baryshkov
2024-03-15 18:34:34 +02:00
committed by Marge Bot
parent 8c95eada0d
commit b8ffa9f956
4 changed files with 4 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/freedreno/rnn/aprintf.c
View File

@@ -1,38 +0,0 @@
/*
* Copyright (C) 2009-2011 Marcin Kościelnicki <koriakin@0x04.net>
* All Rights Reserved.
*
* 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 (including the next
* paragraph) 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.
*/
#include "util.h"
#include <stdarg.h>
char *aprintf(const char *format, ...) {
va_list va;
va_start(va, format);
size_t sz = vsnprintf(0, 0, format, va);
va_end(va);
char *res = malloc(sz + 1);
va_start(va, format);
vsnprintf(res, sz + 1, format, va);
va_end(va);
return res;
}

1
src/freedreno/rnn/meson.build
View File

@@ -19,7 +19,6 @@
# SOFTWARE.
libfreedreno_rnn_files = files(
'aprintf.c',
'colors.c',
'colors.h',
'path.c',

5
src/freedreno/rnn/rnn.c
View File

@@ -44,9 +44,12 @@
#include "util/u_debug.h"
static char *catstr (char *a, char *b) {
char *res;
if (!a)
return b;
return aprintf("%s_%s", a, b);
return asprintf(&res, "%s_%s", a, b) < 0 ? NULL : res;
}
static int strdiff (const char *a, const char *b) {

2
src/freedreno/rnn/util.h
View File

@@ -110,6 +110,4 @@ struct astr {
void print_escaped_astr(FILE *out, struct astr *astr);
char *aprintf(const char *format, ...);
#endif