mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-09-01 02:49:10 +00:00
Code Issues Activity

(svn r14541) -Fix (r14540): mingw didn't like it :(

Browse Source
This commit is contained in:
rubidium
2008-10-28 15:47:42 +00:00
parent 0d254e8914
commit da0a0ef8ca
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/string.cpp
View File

@@ -14,6 +14,23 @@
#include <stdarg.h>
#include <ctype.h> // required for tolower()
/**
* Safer implementation of vsnprintf; same as vsnprintf except:
* - last instead of size, i.e. replace sizeof with lastof.
* - return gives the amount of characters added, not what it would add.
* @param str buffer to write to up to last
* @param last last character we may write to
* @param format the formatting (see snprintf)
* @param ap the list of arguments for the format
* @return the number of added characters
*/
static int CDECL vseprintf(char *str, const char *last, const char *format, va_list ap)
{
if (str >= last) return 0;
size_t size = last - str;
return min((int)size, vsnprintf(str, size, format, ap));
}
void ttd_strlcat(char *dst, const char *src, size_t size)
{
assert(size > 0);
@@ -204,24 +221,6 @@ int CDECL seprintf(char *str, const char *last, const char *format, ...)
return ret;
}
/**
* Safer implementation of vsnprintf; same as vsnprintf except:
* - last instead of size, i.e. replace sizeof with lastof.
* - return gives the amount of characters added, not what it would add.
* @param str buffer to write to up to last
* @param last last character we may write to
* @param format the formatting (see snprintf)
* @param ap the list of arguments for the format
* @return the number of added characters
*/
int CDECL vseprintf(char *str, const char *last, const char *format, va_list ap)
{
if (str >= last) return 0;
size_t size = last - str;
return min((int)size, vsnprintf(str, size, format, ap));
}
/** Convert the md5sum to a hexadecimal string representation
* @param buf buffer to put the md5sum into