Mercurial > hg > nginx

comparison src/os/win32/ngx_win32_init.c @ 7874:d1079d6b2f19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed format strings for ngx_win32_version.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 18 Jun 2021 04:00:21 +0300
parents 4f6e315eef15
children
comparison
equal deleted inserted replaced
7873:0302a4f0b6c4 7874:d1079d6b2f19
293 * as WORD wReserved[2] 293 * as WORD wReserved[2]
294 */ 294 */
295 osviex_stub = (ngx_osviex_stub_t *) &osvi.wServicePackMinor; 295 osviex_stub = (ngx_osviex_stub_t *) &osvi.wServicePackMinor;
296 296
297 ngx_log_error(NGX_LOG_INFO, log, 0, 297 ngx_log_error(NGX_LOG_INFO, log, 0,
298 "OS: %ud build:%ud, \"%s\", suite:%Xd, type:%ud", 298 "OS: %ui build:%ud, \"%s\", suite:%Xd, type:%ud",
299 ngx_win32_version, osvi.dwBuildNumber, osvi.szCSDVersion, 299 ngx_win32_version, osvi.dwBuildNumber, osvi.szCSDVersion,
300 osviex_stub->wSuiteMask, osviex_stub->wProductType); 300 osviex_stub->wSuiteMask, osviex_stub->wProductType);
301 301
302 } else { 302 } else {
303 if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) { 303 if (osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
304 304
305 /* Win9x build */ 305 /* Win9x build */
306 306
307 ngx_log_error(NGX_LOG_INFO, log, 0, 307 ngx_log_error(NGX_LOG_INFO, log, 0,
308 "OS: %u build:%ud.%ud.%ud, \"%s\"", 308 "OS: %ui build:%ud.%ud.%ud, \"%s\"",
309 ngx_win32_version, 309 ngx_win32_version,
310 osvi.dwBuildNumber >> 24, 310 osvi.dwBuildNumber >> 24,
311 (osvi.dwBuildNumber >> 16) & 0xff, 311 (osvi.dwBuildNumber >> 16) & 0xff,
312 osvi.dwBuildNumber & 0xffff, 312 osvi.dwBuildNumber & 0xffff,
313 osvi.szCSDVersion); 313 osvi.szCSDVersion);
319 * 319 *
320 * we do not currently support VER_PLATFORM_WIN32_CE 320 * we do not currently support VER_PLATFORM_WIN32_CE
321 * and we do not support VER_PLATFORM_WIN32s at all 321 * and we do not support VER_PLATFORM_WIN32s at all
322 */ 322 */
323 323
324 ngx_log_error(NGX_LOG_INFO, log, 0, "OS: %ud build:%ud, \"%s\"", 324 ngx_log_error(NGX_LOG_INFO, log, 0, "OS: %ui build:%ud, \"%s\"",
325 ngx_win32_version, osvi.dwBuildNumber, 325 ngx_win32_version, osvi.dwBuildNumber,
326 osvi.szCSDVersion); 326 osvi.szCSDVersion);
327 } 327 }
328 } 328 }
329 } 329 }