Author: anthm Date: Sun Apr 22 15:11:22 2007 New Revision: 5001 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core_session.c Log: Small tweaks so it actually compiles Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun Apr 22 15:11:22 2007 @@ -1 +1 @@ -Tue Apr 19 14:23:59 EDT 2007 +Sat Apr 21 16:48:55 EDT 2007 Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sun Apr 22 15:11:22 2007 @@ -339,7 +339,7 @@ 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); } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Sun Apr 22 15:11:22 2007 @@ -693,13 +693,14 @@ 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_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);