mirror of
https://github.com/FWGS/xash3d-fwgs
synced 2024-11-26 11:49:25 +01:00
public: simplified strings operations.
This commit is contained in:
parent
3da736a1eb
commit
3488d4e65f
@ -560,14 +560,14 @@ char *Q_pretifymem( float value, int digitsafterdecimal )
|
|||||||
if( value > onemb )
|
if( value > onemb )
|
||||||
{
|
{
|
||||||
value /= onemb;
|
value /= onemb;
|
||||||
Q_sprintf( suffix, " Mb" );
|
Q_strcpy( suffix, " Mb" );
|
||||||
}
|
}
|
||||||
else if( value > onekb )
|
else if( value > onekb )
|
||||||
{
|
{
|
||||||
value /= onekb;
|
value /= onekb;
|
||||||
Q_sprintf( suffix, " Kb" );
|
Q_strcpy( suffix, " Kb" );
|
||||||
}
|
}
|
||||||
else Q_sprintf( suffix, " bytes" );
|
else Q_strcpy( suffix, " bytes" );
|
||||||
|
|
||||||
// clamp to >= 0
|
// clamp to >= 0
|
||||||
digitsafterdecimal = Q_max( digitsafterdecimal, 0 );
|
digitsafterdecimal = Q_max( digitsafterdecimal, 0 );
|
||||||
@ -591,8 +591,8 @@ char *Q_pretifymem( float value, int digitsafterdecimal )
|
|||||||
o = out;
|
o = out;
|
||||||
|
|
||||||
// search for decimal or if it was integral, find the space after the raw number
|
// search for decimal or if it was integral, find the space after the raw number
|
||||||
dot = Q_strstr( i, "." );
|
dot = Q_strchr( i, '.' );
|
||||||
if( !dot ) dot = Q_strstr( i, " " );
|
if( !dot ) dot = Q_strchr( i, ' ' );
|
||||||
|
|
||||||
pos = dot - i; // compute position of dot
|
pos = dot - i; // compute position of dot
|
||||||
pos -= 3; // don't put a comma if it's <= 3 long
|
pos -= 3; // don't put a comma if it's <= 3 long
|
||||||
@ -750,7 +750,7 @@ void COM_ExtractFilePath( const char *path, char *dest )
|
|||||||
memcpy( dest, path, src - path );
|
memcpy( dest, path, src - path );
|
||||||
dest[src - path - 1] = 0; // cutoff backslash
|
dest[src - path - 1] = 0; // cutoff backslash
|
||||||
}
|
}
|
||||||
else Q_strcpy( dest, "" ); // file without path
|
else dest[0] = 0; // file without path
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -785,10 +785,12 @@ COM_DefaultExtension
|
|||||||
void COM_DefaultExtension( char *path, const char *extension )
|
void COM_DefaultExtension( char *path, const char *extension )
|
||||||
{
|
{
|
||||||
const char *src;
|
const char *src;
|
||||||
|
size_t len;
|
||||||
|
|
||||||
// if path doesn't have a .EXT, append extension
|
// if path doesn't have a .EXT, append extension
|
||||||
// (extension should include the .)
|
// (extension should include the .)
|
||||||
src = path + Q_strlen( path ) - 1;
|
len = Q_strlen( path );
|
||||||
|
src = path + len - 1;
|
||||||
|
|
||||||
while( *src != '/' && src != path )
|
while( *src != '/' && src != path )
|
||||||
{
|
{
|
||||||
@ -797,7 +799,7 @@ void COM_DefaultExtension( char *path, const char *extension )
|
|||||||
src--;
|
src--;
|
||||||
}
|
}
|
||||||
|
|
||||||
Q_strcat( path, extension );
|
Q_strcpy( &path[len], extension );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user