Changeset 3424 for pjproject/trunk/pjlib/src/pj/os_info.c

Timestamp:

Feb 28, 2011 8:28:48 AM (14 years ago)

Author:

bennylp

Message:

Implementation of re #1202 (PJLIB System Information API) on Win32 and Windows mobile targets

File:

• pjproject/trunk/pjlib/src/pj/os_info.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/os_info.c

@@ -134 +134 @@
         ovi.dwOSVersionInfoSize = sizeof(ovi);
 
-        if (GetVersionInfoEx(&ovi) == FALSE)
+        if (GetVersionEx(&ovi) == FALSE)
             goto get_sdk_info;
 
@@ -224 +224 @@
         char tmp[PJ_SYS_INFO_BUFFER_SIZE];
         char os_ver[20], sdk_ver[20];
-        int len;
-
-        len = pj_ansi_snprintf(tmp, sizeof(tmp),
+        int cnt;
+
+        cnt = pj_ansi_snprintf(tmp, sizeof(tmp),
                                "%s%s/%s/%s%s",
                                si.os_name.ptr,
@@ -233 +233 @@
                                si.sdk_name.ptr,
                                ver_info(si.sdk_ver, sdk_ver));
-        if (len > 0 && len < sizeof(tmp)) {
+        if (cnt > 0 && cnt < (int)sizeof(tmp)) {
             ALLOC_CP_STR(tmp, info);
         }