cpp/openttd-patchpack/source Changeset - r11218:cee1b66a1464

Changeset - r11218:cee1b66a1464

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

smatz - 16 years ago 2009-02-24 22:25:23
smatz@openttd.org

(svn r15571) -Fix: incorrect use of memset

4 files changed with 4 insertions and 4 deletions:

src/core/mem_func.hpp

src/network/network_gui.cpp

src/newgrf_commons.cpp

src/win32.cpp

0 comments (0 inline, 0 general)

src/core/mem_func.hpp

➞

Show inline comments

@@ @@ -42,7 +42,7 @@ static FORCEINLINE void MemMoveT(T *dest @@
  * @param num number of items to be set (!not number of bytes!)
  */
 template <typename T>
-static FORCEINLINE void MemSetT(T *ptr, int value, uint num = 1)
+static FORCEINLINE void MemSetT(T *ptr, byte value, uint num = 1)
+{
 	memset(ptr, value, num * sizeof(T));
+}

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -1323,7 +1323,7 @@ struct NetworkLobbyWindow : public Windo @@
 				NetworkTCPQueryServer(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); // company info
 				NetworkUDPQueryServer(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port)); // general data
 				/* Clear the information so removed companies don't remain */
 				memset(this->company_info, 0, sizeof(company_info));
+				memset(this->company_info, 0, sizeof(this->company_info));
 				break;
+		}
+	}

src/newgrf_commons.cpp

➞

Show inline comments

@@ @@ -26,7 +26,7 @@ OverrideManagerBase::OverrideManagerBase @@
 	mapping_ID = CallocT<EntityIDMapping>(max_new_entities);
 	entity_overrides = MallocT<uint16>(max_offset);
-	memset(entity_overrides, invalid, sizeof(entity_overrides));
+	for (size_t i = 0; i < max_offset; i++) entity_overrides[i] = invalid;
 	grfid_overrides = CallocT<uint32>(max_offset);
+}

src/win32.cpp

➞

Show inline comments

@@ @@ -150,7 +150,7 @@ static uint32 CalcCRC(byte *data, uint s @@
 static void GetFileInfo(DebugFileInfo *dfi, const TCHAR *filename)
+{
 	HANDLE file;
 	memset(dfi, 0, sizeof(dfi));
+	memset(dfi, 0, sizeof(*dfi));
 	file = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
 	if (file != INVALID_HANDLE_VALUE) {

0 comments (0 inline, 0 general)