diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-03-10 12:57:12 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-03-10 12:57:12 +0000 |
commit | 0873e0d2170db76241bf5afe812acead0d531b8e (patch) | |
tree | bc50b6a1fe32c5b0ae24d1c188f166ea82c278f8 /pjlib/src | |
parent | 9034bec3635469ec1041e783ac2343c22b64c04c (diff) |
Fixed compilation and run warnings/errors with MSVC 2005
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@315 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src')
-rw-r--r-- | pjlib/src/pj/config.c | 2 | ||||
-rw-r--r-- | pjlib/src/pj/errno.c | 3 | ||||
-rw-r--r-- | pjlib/src/pj/log.c | 10 | ||||
-rw-r--r-- | pjlib/src/pj/os_core_win32.c | 22 | ||||
-rw-r--r-- | pjlib/src/pj/os_error_win32.c | 5 | ||||
-rw-r--r-- | pjlib/src/pj/pool.c | 5 | ||||
-rw-r--r-- | pjlib/src/pjlib-test/main.c | 1 |
7 files changed, 22 insertions, 26 deletions
diff --git a/pjlib/src/pj/config.c b/pjlib/src/pj/config.c index 3d0bf779..7c2d2d96 100644 --- a/pjlib/src/pj/config.c +++ b/pjlib/src/pj/config.c @@ -21,7 +21,7 @@ #include <pj/ioqueue.h> static const char *id = "config.c"; -const char *PJ_VERSION = "0.5.4"; +const char *PJ_VERSION = "0.5.4.1"; PJ_DEF(void) pj_dump_config(void) { diff --git a/pjlib/src/pj/errno.c b/pjlib/src/pj/errno.c index 9536288e..9843105c 100644 --- a/pjlib/src/pj/errno.c +++ b/pjlib/src/pj/errno.c @@ -19,7 +19,6 @@ #include <pj/errno.h> #include <pj/string.h> #include <pj/assert.h> -#include <pj/compat/sprintf.h> /* Prototype for platform specific error message, which will be defined * in separate file. @@ -141,7 +140,7 @@ PJ_DEF(pj_str_t) pj_strerror( pj_status_t statcode, pj_assert(buf && bufsize); if (statcode < PJ_ERRNO_START + PJ_ERRNO_SPACE_SIZE) { - len = pj_snprintf( buf, bufsize, "Unknown error %d", statcode); + len = pj_ansi_snprintf( buf, bufsize, "Unknown error %d", statcode); } else if (statcode < PJ_ERRNO_START_STATUS + PJ_ERRNO_SPACE_SIZE) { len = pjlib_error(statcode, buf, bufsize); diff --git a/pjlib/src/pj/log.c b/pjlib/src/pj/log.c index 066e765f..5b6dfe79 100644 --- a/pjlib/src/pj/log.c +++ b/pjlib/src/pj/log.c @@ -20,7 +20,6 @@ #include <pj/log.h> #include <pj/string.h> #include <pj/os.h> -#include <pj/compat/vsprintf.h> #include <pj/compat/stdarg.h> #if PJ_LOG_MAX_LEVEL >= 1 @@ -88,7 +87,7 @@ PJ_DEF(void) pj_log( const char *sender, int level, if (log_decor & PJ_LOG_HAS_DAY_NAME) { static const char *wdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; - strcpy(pre, wdays[ptime.wday]); + pj_ansi_strcpy(pre, wdays[ptime.wday]); pre += 3; } if (log_decor & PJ_LOG_HAS_YEAR) { @@ -137,10 +136,11 @@ PJ_DEF(void) pj_log( const char *sender, int level, len = pre - log_buffer; /* Print the whole message to the string log_buffer. */ - print_len = vsnprintf(pre, sizeof(log_buffer)-len, format, marker); + print_len = pj_ansi_vsnprintf(pre, sizeof(log_buffer)-len, format, + marker); if (print_len < 0) { - print_len = pj_snprintf(pre, sizeof(log_buffer)-len, - "<logging error: msg too long>"); + print_len = pj_ansi_snprintf(pre, sizeof(log_buffer)-len, + "<logging error: msg too long>"); } len = len + print_len; if (len > 0 && len < sizeof(log_buffer)-2) { diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c index d32e97e1..70cbe136 100644 --- a/pjlib/src/pj/os_core_win32.c +++ b/pjlib/src/pj/os_core_win32.c @@ -23,8 +23,6 @@ #include <pj/guid.h> #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> #include <stddef.h> @@ -230,9 +228,9 @@ PJ_DEF(pj_status_t) pj_thread_register ( const char *cstr_thread_name, #endif 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); if (rc != PJ_SUCCESS) @@ -309,9 +307,9 @@ PJ_DEF(pj_status_t) pj_thread_create( pj_pool_t *pool, thread_name = "thr%p"; 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'; } @@ -688,9 +686,9 @@ static pj_status_t init_mutex(pj_mutex_t *mutex, const char *name) name = "mtx%p"; } 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'; } @@ -1044,9 +1042,9 @@ PJ_DEF(pj_status_t) pj_sem_create( pj_pool_t *pool, name = "sem%p"; } 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'; } @@ -1174,9 +1172,9 @@ PJ_DEF(pj_status_t) pj_event_create( pj_pool_t *pool, name = "evt%p"; } 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'; } diff --git a/pjlib/src/pj/os_error_win32.c b/pjlib/src/pj/os_error_win32.c index b8f0d039..8c6d56c3 100644 --- a/pjlib/src/pj/os_error_win32.c +++ b/pjlib/src/pj/os_error_win32.c @@ -19,8 +19,6 @@ #include <pj/errno.h> #include <pj/assert.h> #include <pj/compat/stdarg.h> -#include <pj/compat/sprintf.h> -#include <pj/compat/vsprintf.h> #include <pj/unicode.h> #include <pj/string.h> @@ -179,7 +177,8 @@ int platform_strerror( pj_os_err_type os_errcode, } if (!len) { - len = snprintf( buf, bufsize, "Unknown native error %u", (unsigned)os_errcode); + len = pj_ansi_snprintf( buf, bufsize, "Unknown native error %u", + (unsigned)os_errcode); buf[len] = '\0'; } diff --git a/pjlib/src/pj/pool.c b/pjlib/src/pj/pool.c index 11f59278..4cda9f4a 100644 --- a/pjlib/src/pj/pool.c +++ b/pjlib/src/pj/pool.c @@ -21,7 +21,6 @@ #include <pj/except.h> #include <pj/assert.h> #include <pj/os.h> -#include <pj/compat/sprintf.h> /* Include inline definitions when inlining is disabled. */ #if !PJ_FUNCTIONS_ARE_INLINED @@ -148,9 +147,9 @@ PJ_DEF(void) pj_pool_init_int( pj_pool_t *pool, if (name) { if (strchr(name, '%') != NULL) { - sprintf(pool->obj_name, name, pool); + pj_ansi_sprintf(pool->obj_name, name, pool); } else { - strncpy(pool->obj_name, name, PJ_MAX_OBJ_NAME); + pj_ansi_strncpy(pool->obj_name, name, PJ_MAX_OBJ_NAME); } } else { pool->obj_name[0] = '\0'; diff --git a/pjlib/src/pjlib-test/main.c b/pjlib/src/pjlib-test/main.c index 20a34478..33141c3a 100644 --- a/pjlib/src/pjlib-test/main.c +++ b/pjlib/src/pjlib-test/main.c @@ -21,6 +21,7 @@ #include <pj/string.h> #include <pj/sock.h> #include <pj/log.h> +#include <stdio.h> extern int param_echo_sock_type; extern const char *param_echo_server; |