# HG changeset patch # User rubidium # Date 2010-06-30 22:17:53 # Node ID 70dc7e2af5436aedc9ac3a8d395860a109148ada # Parent 717f25b0b15f708c9e90b49ff566c5ed21e5ecfb (svn r20040) -Codechange: some coding style + using proper types diff --git a/src/screenshot.cpp b/src/screenshot.cpp --- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -482,12 +482,13 @@ static const ScreenshotFormat _screensho void InitializeScreenshotFormats() { - int i, j; - for (i = 0, j = 0; i != lengthof(_screenshot_formats); i++) + uint j = 0; + for (uint i = 0; i < lengthof(_screenshot_formats); i++) { if (!strcmp(_screenshot_format_name, _screenshot_formats[i].extension)) { j = i; break; } + } _cur_screenshot_format = j; _num_screenshot_formats = lengthof(_screenshot_formats); } @@ -497,8 +498,9 @@ const char *GetScreenshotFormatDesc(int return _screenshot_formats[i].name; } -void SetScreenshotFormat(int i) +void SetScreenshotFormat(uint i) { + assert(i < _num_screenshot_formats); _cur_screenshot_format = i; strecpy(_screenshot_format_name, _screenshot_formats[i].extension, lastof(_screenshot_format_name)); } diff --git a/src/screenshot.h b/src/screenshot.h --- a/src/screenshot.h +++ b/src/screenshot.h @@ -15,7 +15,7 @@ void InitializeScreenshotFormats(); const char *GetScreenshotFormatDesc(int i); -void SetScreenshotFormat(int i); +void SetScreenshotFormat(uint i); /** Type of requested screenshot */ enum ScreenshotType {