Small tweaks so it actually compiles

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5001 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 6d61801aa84a7736285e6714a702133d05aa9722..d352ddaf237cf68bde8b2649862be7233e24b09f 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue Apr 19 14:23:59 EDT 2007
+Sat Apr 21 16:48:55 EDT 2007

diff --git a/src/switch.c b/src/switch.c
index eb06bc73abf7b801ec46002dc5d1a778cafa19fe..4f4c3f00aa15a6448c5f74cba83c0ec9ef0faabb 100644 (file)
--- a/src/switch.c
+++ b/src/switch.c
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
                        known_opt++;
                }
 
-               if (!known_opt || argv[x] && !strcmp(argv[x], "-help")) {
+               if ((!known_opt || argv[x]) && !strcmp(argv[x], "-help")) {
                        printf("%s\n", usageDesc);
                        exit(0);
                }

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index 0e7d62e9c62631afcc3a51623eccb68b49fa1656..96b1589ed206b7f64ee00c27df375c4ef538d0b4 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -693,13 +693,14 @@ static void *SWITCH_THREAD_FUNC switch_core_session_thread(switch_thread_t * thr
 
        switch_core_session_run(session);
        switch_core_media_bug_remove_all(session);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %u (%s) Locked, Waiting on external entities\n",
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %"SWITCH_SIZE_T_FMT" (%s) Locked, Waiting on external entities\n",
                                          session->id, switch_channel_get_name(session->channel));
        switch_core_session_write_lock(session);
        switch_set_flag(session, SSF_DESTROYED);
        switch_core_session_rwunlock(session);
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Session %u (%s) Ended\n", session->id, switch_channel_get_name(session->channel));
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Session %"SWITCH_SIZE_T_FMT" (%s) Ended\n",
+                                         session->id, switch_channel_get_name(session->channel));
        switch_core_session_destroy(&session);
        return NULL;
 }
@@ -805,7 +806,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch
        switch_thread_cond_create(&session->cond, session->pool);
        switch_thread_rwlock_create(&session->rwlock, session->pool);
 
-       snprintf(session->name, sizeof(session->name), "%u", session->id);
+       snprintf(session->name, sizeof(session->name), "%"SWITCH_SIZE_T_FMT, session->id);
        switch_mutex_lock(runtime.session_table_mutex);
        session->id = runtime.session_id++;
        switch_core_hash_insert(runtime.session_table, session->uuid_str, session);