cpp/openttd-patchpack/source Changeset - r2234:6f59925a7314

Changeset - r2234:6f59925a7314

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

tron - 19 years ago 2005-07-29 21:52:20
tron@openttd.org

(svn r2754) Move str_fmt into string.[ch]

4 files changed with 20 insertions and 17 deletions:

functions.h

openttd.c

string.c

string.h

0 comments (0 inline, 0 general)

functions.h

➞

Show inline comments

@@ @@ -275,7 +275,6 @@ void CheckConfig(void); @@
 int ttd_main(int argc, char* argv[]);
 void DeterminePaths(void);
 char * CDECL str_fmt(const char *str, ...);
 void bubblesort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
 bool CreateOTTDThread(void *func, void *param);

openttd.c

➞

Show inline comments

@@ @@ -93,22 +93,6 @@ void CDECL ShowInfoF(const char *str, .. @@
 	ShowInfo(buf);
+}
 char * CDECL str_fmt(const char *str, ...)
+{
 	char buf[4096];
 	va_list va;
 	int len;
 	char *p;
 	va_start(va, str);
 	len = vsprintf(buf, str, va);
 	va_end(va);
 	p = malloc(len + 1);
 	if (p)
 		memcpy(p, buf, len + 1);
 	return p;
+}
 void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
+{

string.c

➞

Show inline comments

@@ @@ -3,6 +3,8 @@ @@
 #include "stdafx.h"
 #include "string.h"
 #include <stdarg.h>
 void ttd_strlcat(char *dst, const char *src, size_t size)
+{
 	assert(size > 0);
@@ @@ -39,3 +41,19 @@ char* strecpy(char* dst, const char* src @@
 	*dst = '\0';
 	return dst;
+}
 char* CDECL str_fmt(const char* str, ...)
+{
 	char buf[4096];
 	va_list va;
 	int len;
 	char* p;
 	va_start(va, str);
 	len = vsprintf(buf, str, va);
 	va_end(va);
 	p = malloc(len + 1);
 	if (p != NULL) memcpy(p, buf, len + 1);
 	return p;
+}

string.h

➞

Show inline comments

@@ @@ -23,4 +23,6 @@ void ttd_strlcpy(char *dst, const char * @@
 char* strecat(char* dst, const char* src, const char* last);
 char* strecpy(char* dst, const char* src, const char* last);
 char* CDECL str_fmt(const char* str, ...);
 #endif

0 comments (0 inline, 0 general)