cpp/openttd-patchpack/source Changeset - r9916:dfe4035b061f

Changeset - r9916:dfe4035b061f

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 16 years ago 2008-08-13 14:52:54
rubidium@openttd.org

(svn r14069) -Fix: silence MSVC 64-bits compile warnings.

3 files changed with 5 insertions and 5 deletions:

src/fileio.cpp

src/misc_gui.cpp

src/querystring_gui.h

0 comments (0 inline, 0 general)

src/fileio.cpp

➞

Show inline comments

@@ @@ -358,30 +358,30 @@ FILE *FioFOpenFile(const char *filename, @@
 		if (f != NULL || subdir == NO_DIRECTORY) break;
+	}
 	/* We can only use .tar in case of data-dir, and read-mode */
 	if (f == NULL && subdir == DATA_DIR && mode[0] == 'r') {
 		static const uint MAX_RESOLVED_LENGTH = 2 * (100 + 100 + 155) + 1; // Enough space to hold two filenames plus link. See 'TarHeader'.
 		char resolved_name[MAX_RESOLVED_LENGTH];
 		/* Filenames in tars are always forced to be lowercase */
 		strcpy(resolved_name, filename);
 		strtolower(resolved_name);
-		uint resolved_len = strlen(resolved_name);
+		size_t resolved_len = strlen(resolved_name);
 		/* Resolve ONE directory link */
 		for (TarLinkList::iterator link = _tar_linklist.begin(); link != _tar_linklist.end(); link++) {
 			const std::string &src = link->first;
-			uint len = src.length();
+			size_t len = src.length();
 			if (resolved_len >= len && resolved_name[len - 1] == PATHSEPCHAR && strncmp(src.c_str(), resolved_name, len) == 0) {
 				/* Apply link */
 				char resolved_name2[MAX_RESOLVED_LENGTH];
 				const std::string &dest = link->second;
 				strcpy(resolved_name2, &(resolved_name[len]));
 				strcpy(resolved_name, dest.c_str());
 				strcpy(&(resolved_name[dest.length()]), resolved_name2);
 				break; // Only resolve one level
+			}
+		}
 		TarFileList::iterator it = _tar_filelist.find(resolved_name);

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -1047,25 +1047,25 @@ void QueryStringBaseWindow::DrawEditBox( @@
 	this->QueryString::DrawEditBox(this, wid);
+}
 enum QueryStringWidgets {
 	QUERY_STR_WIDGET_TEXT = 3,
 	QUERY_STR_WIDGET_CANCEL,
 	QUERY_STR_WIDGET_OK
 };
 struct QueryStringWindow : public QueryStringBaseWindow
+{
-	QueryStringWindow(size_t size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc)
+	QueryStringWindow(uint16 size, const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(size, desc)
+	{
 		this->parent = parent;
 		SetBit(_no_scroll, SCROLL_EDIT);
 		this->FindWindowPlacementAndResize(desc);
+	}
 	virtual void OnPaint()
+	{
 		SetDParam(0, this->caption);
 		this->DrawWidgets();

src/querystring_gui.h

➞

Show inline comments

@@ @@ -30,29 +30,29 @@ struct QueryString { @@
 	 */
 	~QueryString()
+	{
 		free((void*)this->orig);
+	}
 	void DrawEditBox(Window *w, int wid);
 	void HandleEditBox(Window *w, int wid);
 	int HandleEditBoxKey(Window *w, int wid, uint16 key, uint16 keycode, Window::EventState &state);
 };
 struct QueryStringBaseWindow : public Window, public QueryString {
 	const size_t edit_str_size;
 	char *edit_str_buf;
 	char *orig_str_buf;
 	const uint16 edit_str_size;
-	QueryStringBaseWindow(size_t size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size)
+	QueryStringBaseWindow(uint16 size, const WindowDesc *desc, WindowNumber window_number = 0) : Window(desc, window_number), edit_str_size(size)
+	{
 		this->edit_str_buf = CallocT<char>(size);
+	}
 	~QueryStringBaseWindow()
+	{
 		free(this->edit_str_buf);
+	}
 	void DrawEditBox(int wid);
 	void HandleEditBox(int wid);
 	int HandleEditBoxKey(int wid, uint16 key, uint16 keycode, EventState &state);

0 comments (0 inline, 0 general)