cpp/openttd-patchpack/source Changeset - r10315:480d8227cc53

Changeset - r10315:480d8227cc53

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 16 years ago 2008-11-03 12:03:00
smatz@openttd.org

(svn r14560) -Fix [FS#2396](r14555): lengthof() can't be simply replaced by lastof() in some cases (part by Aali)

2 files changed with 4 insertions and 4 deletions:

src/network/network_server.cpp

src/unix.cpp

0 comments (0 inline, 0 general)

src/network/network_server.cpp

➞

Show inline comments

@@ @@ -1372,7 +1372,7 @@ void NetworkPopulateCompanyInfo() @@
 	ci = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX);
 	// Register local company (if not dedicated)
 	if (ci != NULL && IsValidCompanyID(ci->client_playas))
-		strecpy(_network_company_info[ci->client_playas].clients, ci->client_name, lastof(_network_company_info[0].clients));
+		strecpy(_network_company_info[ci->client_playas].clients, ci->client_name, lastof(_network_company_info[ci->client_playas].clients));
 	FOR_ALL_CLIENTS(cs) {
 		char client_name[NETWORK_CLIENT_NAME_LENGTH];
@@ @@ -1382,10 +1382,10 @@ void NetworkPopulateCompanyInfo() @@
 		ci = DEREF_CLIENT_INFO(cs);
 		if (ci != NULL && IsValidCompanyID(ci->client_playas)) {
 			if (!StrEmpty(_network_company_info[ci->client_playas].clients)) {
-				strecat(_network_company_info[ci->client_playas].clients, ", ", lastof(_network_company_info[0].clients));
+				strecat(_network_company_info[ci->client_playas].clients, ", ", lastof(_network_company_info[ci->client_playas].clients));
+			}
-			strecat(_network_company_info[ci->client_playas].clients, client_name, lastof(_network_company_info[0].clients));
+			strecat(_network_company_info[ci->client_playas].clients, client_name, lastof(_network_company_info[ci->client_playas].clients));
+		}
+	}
+}

src/unix.cpp

➞

Show inline comments

@@ @@ -154,7 +154,7 @@ static const char *convert_tofrom_fs(ico @@
 	size_t outlen = sizeof(buf) - 1;
 	size_t inlen  = strlen(name);
-	strecpy(outbuf, name, lastof(buf));
+	strecpy(outbuf, name, outbuf + outlen);
 	iconv(convd, NULL, NULL, NULL, NULL);
 	if (iconv(convd, &inbuf, &inlen, &outbuf, &outlen) == (size_t)(-1)) {

0 comments (0 inline, 0 general)