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 /pjsip-apps | |
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 'pjsip-apps')
-rw-r--r-- | pjsip-apps/build/pjsip_perf.dsp | 4 | ||||
-rw-r--r-- | pjsip-apps/build/pjsua.dsp | 4 | ||||
-rw-r--r-- | pjsip-apps/src/pjsip-perf/main.c | 2 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/main.c | 22 |
4 files changed, 17 insertions, 15 deletions
diff --git a/pjsip-apps/build/pjsip_perf.dsp b/pjsip-apps/build/pjsip_perf.dsp index 4b8906d9..d745bc53 100644 --- a/pjsip-apps/build/pjsip_perf.dsp +++ b/pjsip-apps/build/pjsip_perf.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\pjsip-perf-i386-win32-vc6d.exe" +# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib ole32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\pjsip-perf-i386-win32-vc6d.exe" !ELSEIF "$(CFG)" == "pjsip_perf - Win32 Debug" @@ -74,7 +74,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /profile /debug /machine:I386 /out:"..\bin\pjsip-perf-i386-win32-vc6d.exe" +# ADD LINK32 netapi32.lib mswsock.lib ws2_32.lib ole32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /profile /debug /machine:I386 /out:"..\bin\pjsip-perf-i386-win32-vc6d.exe" !ENDIF diff --git a/pjsip-apps/build/pjsua.dsp b/pjsip-apps/build/pjsua.dsp index 65fe038f..11ab7c3c 100644 --- a/pjsip-apps/build/pjsua.dsp +++ b/pjsip-apps/build/pjsua.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386 /out:"../bin/pjsua_vc6.exe" /fixed:no
+# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib ole32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386 /out:"../bin/pjsua_vc6.exe" /fixed:no
# SUBTRACT LINK32 /pdb:none /debug
!ELSEIF "$(CFG)" == "pjsua - Win32 Debug"
@@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjsua_vc6d.exe" /pdbtype:sept
+# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib ole32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/pjsua_vc6d.exe" /pdbtype:sept
!ENDIF
diff --git a/pjsip-apps/src/pjsip-perf/main.c b/pjsip-apps/src/pjsip-perf/main.c index 4629be04..0bf0d3a8 100644 --- a/pjsip-apps/src/pjsip-perf/main.c +++ b/pjsip-apps/src/pjsip-perf/main.c @@ -20,7 +20,7 @@ #include <pjsua-lib/getopt.h> #include <stdlib.h> /* atoi */ -//#define THIS_FILE "main.c" +#define THIS_FILE "main.c" pjsip_perf_settings settings; diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c index 715fde8f..5f5ee3af 100644 --- a/pjsip-apps/src/pjsua/main.c +++ b/pjsip-apps/src/pjsua/main.c @@ -18,7 +18,7 @@ */ #include <pjsua-lib/pjsua.h> #include <stdlib.h> /* atoi */ - +#include <stdio.h> #define THIS_FILE "main.c" @@ -205,19 +205,21 @@ static void print_acc_status(int acc_index) pjsua.acc[acc_index].reg_last_code<=699) { pjsip_regc_info info; + const pj_str_t *status_str; pjsip_regc_get_info(pjsua.acc[acc_index].regc, &info); - pj_snprintf(reg_status, sizeof(reg_status), - "%s (%.*s;expires=%d)", - pjsip_get_status_text(pjsua.acc[acc_index].reg_last_code)->ptr, - (int)info.client_uri.slen, - info.client_uri.ptr, - info.next_reg); + status_str = pjsip_get_status_text(pjsua.acc[acc_index].reg_last_code); + pj_ansi_snprintf(reg_status, sizeof(reg_status), + "%s (%.*s;expires=%d)", + status_str->ptr, + (int)info.client_uri.slen, + info.client_uri.ptr, + info.next_reg); } else { - pj_sprintf(reg_status, "in progress (%d)", - pjsua.acc[acc_index].reg_last_code); + pj_ansi_sprintf(reg_status, "in progress (%d)", + pjsua.acc[acc_index].reg_last_code); } printf("[%2d] Registration status: %s\n", acc_index, reg_status); @@ -385,7 +387,7 @@ static void conf_list(void) for (j=0; j<pjsua.max_calls+PJSUA_CONF_MORE_PORTS; ++j) { char s[10]; if (port_info->listener[j]) { - pj_sprintf(s, "#%d ", j); + pj_ansi_sprintf(s, "#%d ", j); pj_ansi_strcat(txlist, s); } } |