From 70a73e47a7b97eb6af2513927a06762235afd874 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Wed, 8 Mar 2023 18:51:25 +0100 Subject: [PATCH] psvita: use crtlib where possible --- engine/common/system.c | 2 +- ref/gl/vgl_shim/vgl_shim.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/engine/common/system.c b/engine/common/system.c index e418c761..2c717840 100644 --- a/engine/common/system.c +++ b/engine/common/system.c @@ -136,7 +136,7 @@ const char *Sys_GetCurrentUser( void ) #elif XASH_PSVITA static string username; sceAppUtilSystemParamGetString( SCE_SYSTEM_PARAM_ID_USERNAME, username, sizeof( username ) - 1 ); - if( username[0] ) + if( !COM_CheckStringEmpty( username ) ) return username; #elif XASH_POSIX && !XASH_ANDROID && !XASH_NSWITCH uid_t uid = geteuid(); diff --git a/ref/gl/vgl_shim/vgl_shim.c b/ref/gl/vgl_shim/vgl_shim.c index 15f49893..456b3b25 100644 --- a/ref/gl/vgl_shim/vgl_shim.c +++ b/ref/gl/vgl_shim/vgl_shim.c @@ -36,6 +36,7 @@ GNU General Public License for more details. #include "dlight.h" #include "ref_api.h" #include "com_strings.h" +#include "crtlib.h" #include "vgl_shim.h" #define MAX_SHADERLEN 4096 @@ -136,17 +137,17 @@ static GLuint VGL_GenerateShader( const vgl_prog_t *prog, GLenum type ) for ( i = 0; i < VGL_FLAG_MAX; ++i ) { - snprintf( tmp, sizeof( tmp ), "#define %s %d\n", vgl_flag_name[i], prog->flags & ( 1 << i ) ); - strncat( shader, tmp, MAX_SHADERLEN ); + Q_snprintf( tmp, sizeof( tmp ), "#define %s %d\n", vgl_flag_name[i], prog->flags & ( 1 << i ) ); + Q_strncat( shader, tmp, MAX_SHADERLEN ); } if ( type == GL_FRAGMENT_SHADER ) - strncat( shader, vgl_frag_src, MAX_SHADERLEN ); + Q_strncat( shader, vgl_frag_src, MAX_SHADERLEN ); else - strncat( shader, vgl_vert_src, MAX_SHADERLEN ); + Q_strncat( shader, vgl_vert_src, MAX_SHADERLEN ); id = glCreateShader( type ); - len = strlen( shader ); + len = Q_strlen( shader ); glShaderSource( id, 1, (const void *)&shader, &len ); glCompileShader( id ); glGetShaderiv( id, GL_COMPILE_STATUS, &status );