Changeset 315 for pjproject/trunk/pjlib/src/pj/os_core_win32.c

Timestamp:

Mar 10, 2006 12:57:12 PM (18 years ago)

Author:

bennylp

Message:

Fixed compilation and run warnings/errors with MSVC 2005

File:

• pjproject/trunk/pjlib/src/pj/os_core_win32.c (modified) (6 diffs)

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

@@ -24 +24 @@
 #include <pj/rand.h>
 #include <pj/assert.h>
-#include <pj/compat/vsprintf.h>
-#include <pj/compat/sprintf.h>
 #include <pj/errno.h>
 #include <pj/except.h>
@@ -231 +229 @@
 
     if (cstr_thread_name && pj_strlen(&thread_name) < sizeof(thread->obj_name)-1)
-        pj_sprintf(thread->obj_name, cstr_thread_name, thread->idthread);
+        pj_ansi_sprintf(thread->obj_name, cstr_thread_name, thread->idthread);
     else
-        pj_sprintf(thread->obj_name, "thr%p", (void*)thread->idthread);
+        pj_ansi_sprintf(thread->obj_name, "thr%p", (void*)thread->idthread);
     
     rc = pj_thread_local_set(thread_tls_id, thread);
@@ -310 +308 @@
 
     if (strchr(thread_name, '%')) {
-        pj_snprintf(rec->obj_name, PJ_MAX_OBJ_NAME, thread_name, rec);
+        pj_ansi_snprintf(rec->obj_name, PJ_MAX_OBJ_NAME, thread_name, rec);
     } else {
-        strncpy(rec->obj_name, thread_name, PJ_MAX_OBJ_NAME);
+        pj_ansi_strncpy(rec->obj_name, thread_name, PJ_MAX_OBJ_NAME);
         rec->obj_name[PJ_MAX_OBJ_NAME-1] = '\0';
     }
@@ -689 +687 @@
     }
     if (strchr(name, '%')) {
-        pj_snprintf(mutex->obj_name, PJ_MAX_OBJ_NAME, name, mutex);
+        pj_ansi_snprintf(mutex->obj_name, PJ_MAX_OBJ_NAME, name, mutex);
     } else {
-        strncpy(mutex->obj_name, name, PJ_MAX_OBJ_NAME);
+        pj_ansi_strncpy(mutex->obj_name, name, PJ_MAX_OBJ_NAME);
         mutex->obj_name[PJ_MAX_OBJ_NAME-1] = '\0';
     }
@@ -1045 +1043 @@
     }
     if (strchr(name, '%')) {
-        pj_snprintf(sem->obj_name, PJ_MAX_OBJ_NAME, name, sem);
+        pj_ansi_snprintf(sem->obj_name, PJ_MAX_OBJ_NAME, name, sem);
     } else {
-        strncpy(sem->obj_name, name, PJ_MAX_OBJ_NAME);
+        pj_ansi_strncpy(sem->obj_name, name, PJ_MAX_OBJ_NAME);
         sem->obj_name[PJ_MAX_OBJ_NAME-1] = '\0';
     }
@@ -1175 +1173 @@
     }
     if (strchr(name, '%')) {
-        pj_snprintf(event->obj_name, PJ_MAX_OBJ_NAME, name, event);
+        pj_ansi_snprintf(event->obj_name, PJ_MAX_OBJ_NAME, name, event);
     } else {
-        strncpy(event->obj_name, name, PJ_MAX_OBJ_NAME);
+        pj_ansi_strncpy(event->obj_name, name, PJ_MAX_OBJ_NAME);
         event->obj_name[PJ_MAX_OBJ_NAME-1] = '\0';
     }