January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11530 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 28 Jan '09

28 Jan '09

Author: mikej Date: Tue Jan 27 19:02:12 2009 New Revision: 11530 Log: mod_easyroute: fix build with -Werror when odbc is not enabled Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Jan 27 19:02:12 2009 @@ -193,7 +193,9 @@ return status; } +#ifdef SWITCH_HAVE_ODBC static char SQL_LOOKUP[] = "SELECT gateways.gateway_ip, gateways.group, gateways.limit, gateways.techprofile, numbers.acctcode, numbers.translated from gateways, numbers where numbers.number = '%q' and numbers.gateway_id = gateways.gateway_id limit 1;"; +#endif static switch_status_t route_lookup(char *dn, easyroute_results_t *results, int noat, char *seperator) {

1 0

[commit] r11529 - freeswitch/trunk/libs/libsndfile/src
by FreeSWITCH SVN 28 Jan '09

28 Jan '09

Author: mikej Date: Tue Jan 27 18:59:06 2009 New Revision: 11529 Log: libsndfile: fix build with -Werror Modified: freeswitch/trunk/libs/libsndfile/src/sndfile.c Modified: freeswitch/trunk/libs/libsndfile/src/sndfile.c ============================================================================== --- freeswitch/trunk/libs/libsndfile/src/sndfile.c (original) +++ freeswitch/trunk/libs/libsndfile/src/sndfile.c Tue Jan 27 18:59:06 2009 @@ -488,7 +488,7 @@ { SF_PRIVATE *psf ; if (sndfile == NULL) - { if (sf_error != 0) + { if (sf_errno != 0) return sf_errno ; return 0 ; } ;

1 0

[commit] r11528 - freeswitch/trunk/libs/codec/ilbc/src
by FreeSWITCH SVN 28 Jan '09

28 Jan '09

Author: mikej Date: Tue Jan 27 18:46:47 2009 New Revision: 11528 Log: libilbc: fix build with -Werror Modified: freeswitch/trunk/libs/codec/ilbc/src/iCBSearch.c Modified: freeswitch/trunk/libs/codec/ilbc/src/iCBSearch.c ============================================================================== --- freeswitch/trunk/libs/codec/ilbc/src/iCBSearch.c (original) +++ freeswitch/trunk/libs/codec/ilbc/src/iCBSearch.c Tue Jan 27 18:46:47 2009 @@ -121,7 +121,7 @@ *ppe=0.0; pp=buf+LPC_FILTERORDER+lMem-lTarget; for (j=0; j<lTarget; j++) { - *ppe+=(*pp)*(*pp++); + *ppe+=(*pp)*((*pp)++); } if (*ppe>0.0) { @@ -303,7 +303,7 @@ pp=cbvectors+lMem-lTarget; for (j=0; j<lTarget; j++) { - *ppe+=(*pp)*(*pp++); + *ppe+=(*pp)*((*pp)++); } ppi = cbvectors + lMem - 1 - lTarget;

1 0

[commit] r11527 - freeswitch/trunk/libs/sqlite/src
by FreeSWITCH SVN 28 Jan '09

28 Jan '09

Author: mikej Date: Tue Jan 27 18:39:04 2009 New Revision: 11527 Log: sqlite: fix build with -Werror Modified: freeswitch/trunk/libs/sqlite/src/os.h freeswitch/trunk/libs/sqlite/src/vdbemem.c freeswitch/trunk/libs/sqlite/src/vtab.c Modified: freeswitch/trunk/libs/sqlite/src/os.h ============================================================================== --- freeswitch/trunk/libs/sqlite/src/os.h (original) +++ freeswitch/trunk/libs/sqlite/src/os.h Tue Jan 27 18:39:04 2009 @@ -64,6 +64,7 @@ # define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP) #else # define SQLITE_TEMPNAME_SIZE 200 +# include <unistd.h> #endif /* If the SET_FULLSYNC macro is not defined above, then make it Modified: freeswitch/trunk/libs/sqlite/src/vdbemem.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/vdbemem.c (original) +++ freeswitch/trunk/libs/sqlite/src/vdbemem.c Tue Jan 27 18:39:04 2009 @@ -760,7 +760,7 @@ pVal->flags |= (pVal->flags & MEM_Blob)>>3; if( pVal->flags&MEM_Str ){ sqlite3VdbeChangeEncoding(pVal, enc & ~SQLITE_UTF16_ALIGNED); - if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(int)pVal->z) ){ + if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&(int)(intptr_t)pVal->z) ){ assert( (pVal->flags & (MEM_Ephem|MEM_Static))!=0 ); if( sqlite3VdbeMemMakeWriteable(pVal)!=SQLITE_OK ){ return 0; @@ -770,7 +770,7 @@ }else{ assert( (pVal->flags&MEM_Blob)==0 ); sqlite3VdbeMemStringify(pVal, enc); - assert( 0==(1&(int)pVal->z) ); + assert( 0==(1&(int)(intptr_t)pVal->z) ); } assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || sqlite3MallocFailed() ); if( pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) ){ Modified: freeswitch/trunk/libs/sqlite/src/vtab.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/vtab.c (original) +++ freeswitch/trunk/libs/sqlite/src/vtab.c Tue Jan 27 18:39:04 2009 @@ -15,6 +15,7 @@ */ #ifndef SQLITE_OMIT_VIRTUALTABLE #include "sqliteInt.h" +#include "os.h" /* ** External API function used to create a new virtual-table module. @@ -562,7 +563,7 @@ ** sqlite3.aVTrans array. Then clear the array itself. */ int sqlite3VtabRollback(sqlite3 *db){ - callFinaliser(db, (int)(&((sqlite3_module *)0)->xRollback)); + callFinaliser(db, (int)(intptr_t)(&((sqlite3_module *)0)->xRollback)); return SQLITE_OK; } @@ -571,7 +572,7 @@ ** sqlite3.aVTrans array. Then clear the array itself. */ int sqlite3VtabCommit(sqlite3 *db){ - callFinaliser(db, (int)(&((sqlite3_module *)0)->xCommit)); + callFinaliser(db, (int)(intptr_t)(&((sqlite3_module *)0)->xCommit)); return SQLITE_OK; }

1 0

[commit] r11525 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 28 Jan '09

28 Jan '09

Author: andrew Date: Tue Jan 27 18:15:05 2009 New Revision: 11525 Log: Add freeswitch.erl - An erlang module to make talking to mod_erlang_event more painless Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/freeswitch.erl Tue Jan 27 18:15:05 2009 @@ -0,0 +1,265 @@ +%% The contents of this file are subject to the Mozilla Public License +%% Version 1.1 (the "License"); you may not use this file except in +%% compliance with the License. You may obtain a copy of the License at +%% http://www.mozilla.org/MPL/ +%% +%% Software distributed under the License is distributed on an "AS IS" +%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +%% License for the specific language governing rights and limitations +%% under the License. +%% +%% @author Andrew Thompson <andrew AT hijacked DOT us> +%% @copyright 2008-2009 Andrew Thompson +%% @doc A module for interfacing with FreeSWITCH using mod_erlang_event. + +-module(freeswitch). + +-export([send/2, api/3, bgapi/3, event/2, + nixevent/2, noevents/1, close/1, + get_event_header/2, get_event_body/1, + get_event_name/1, start_fetch_handler/4, + start_log_handler/3, start_event_handler/3]). +-define(TIMEOUT, 10000). + +%% @doc Return the value for a specific header in an event or `{error,notfound}'. +get_event_header([], _Needle) -> + {error, notfound}; +get_event_header({event, Headers}, Needle) when is_list(Headers) -> + get_event_header(Headers, Needle); +get_event_header([undefined | Headers], Needle) -> + get_event_header(Headers, Needle); +get_event_header([UUID | Headers], Needle) when is_list(UUID) -> + get_event_header(Headers, Needle); +get_event_header([{Key,Value} | Headers], Needle) -> + case Key of + Needle -> + Value; + _ -> + get_event_header(Headers, Needle) + end. + +%% @doc Return the name of the event. +get_event_name(Event) -> + get_event_header(Event, "Event-Name"). + +%% @doc Return the body of the event or `{error, notfound}' if no event body. +get_event_body(Event) -> + get_event_header(Event, "body"). + +%% @doc Send a raw term to FreeSWITCH. Returns the reply or `timeout' on a +%% timeout. +send(Node, Term) -> + {send, Node} ! Term, + receive + Response -> + Response + after ?TIMEOUT -> + timeout + end. + +%% @doc Make a blocking API call to FreeSWITCH. The result of the API call is +%% returned or `timeout' if FreeSWITCH fails to respond. +api(Node, Cmd, Args) -> + {api, Node} ! {api, Cmd, Args}, + receive + X -> X + after ?TIMEOUT -> + timeout + end. + +%% @doc Make a backgrounded API call to FreeSWITCH. The asynchronous reply is +%% sent to calling process after it is received. This function +%% returns the result of the initial bgapi call or `timeout' if FreeSWITCH fails +%% to respond. +bgapi(Node, Cmd, Args) -> + Self = self(), + % spawn a new process so that both responses go here instead of directly to + % the calling process. + spawn(fun() -> + {bgapi, Node} ! {bgapi, Cmd, Args}, + receive + {error, Reason} -> + % send the error condition to the calling process + Self ! {api, {error, Reason}}; + {ok, JobID} -> + % send the reply to the calling process + Self ! {api, ok}, + receive % wait for the job's reply + {bgok, JobID, Reply} -> + % send the actual command output back to the calling process + Self ! {bgok, Reply}; + {bgerror, JobID, Reply} -> + Self ! {bgerror, Reply} + end + after ?TIMEOUT -> + % send a timeout to the calling process + Self ! {api, timeout} + end + end), + + % get the initial result of the command, NOT the asynchronous response, and + % return it + receive + {api, X} -> X + end. + +%% @doc Request to receive any events in the list `List'. +event(Node, Events) when is_list(Events) -> + {event, Node} ! list_to_tuple(lists:append([event], Events)), + receive + X -> X + after ?TIMEOUT -> + timeout + end; +event(Node, Event) when is_atom(Event) -> + event(Node, [Event]). + +%% @doc Stop receiving any events in the list `Events' from `Node'. +nixevent(Node, Events) when is_list(Events) -> + {nixevent, Node} ! list_to_tuple(lists:append([nixevent], Events)), + receive + X -> X + after ?TIMEOUT -> + timeout + end; +nixevent(Node, Event) when is_atom(Event) -> + nixevent(Node, [Event]). + +%% @doc Stop receiving any events from `Node'. +noevents(Node) -> + {noevents, Node} ! noevents, + receive + X -> X + after ?TIMEOUT -> + timeout + end. + +%% @doc Close the connection to `Node'. +close(Node) -> + {close, Node} ! exit, + receive + X -> X + after ?TIMEOUT -> + timeout + end. + +%% @doc Send an event to FreeSWITCH. `EventName' is the name of the event and +%% `Headers' is a list of `{Key, Value}' string tuples. See the mod_event_socket +%% documentation for more information. +sendevent(Node, EventName, Headers) -> + {sendevent, Node} ! {sendevent, EventName, Headers}, + receive + X -> X + after ?TIMEOUT -> + timeout + end. + +%% @doc Send a message to the call identified by `UUID'. `Headers' is a list of +%% `{Key, Value}' string tuples. +sendmsg(Node, UUID, Headers) -> + {sendmsg, Node} ! {sendmsg, UUID, Headers}, + receive + X -> X + after ?TIMEOUT -> + timeout + end. + + +%% @doc Get the fake pid of the FreeSWITCH node at `Node'. This can be helpful +%% for linking to the process. Returns `{ok, Pid}' or `timeout'. +getpid(Node) -> + {getpid, Node} ! getpid, + receive + X -> X + after ?TIMEOUT -> + timeout + end. + +%% @doc Request that FreeSWITCH send any events pertaining to call `UUID' to +%% `Process' where process is a registered process name. +handlecall(Node, Process) -> + {handlecall, Node} ! {handlecall, Process}, + receive + X -> X + after ?TIMEOUT -> + timeout + end. + +%% @private +start_handler(Node, Type, Module, Function) -> + Self = self(), + spawn(fun() -> + monitor_node(Node, true), + {foo, Node} ! Type, + receive + ok -> + Self ! {Type, {ok, self()}}, + apply(Module, Function, [Node]); + {error,Reason} -> + Self ! {Type, {error, Reason}} + after ?TIMEOUT -> + Self ! {Type, timeout} + end + end), + + receive + {Type, X} -> X + end. + +%% @todo Notify the process if it gets replaced by a new log handler. + +%% @doc Spawn `Module':`Function' as a log handler. The process will receive +%% messages of the form `{log, [{level, LogLevel}, {text_channel, TextChannel}, {file, FileName}, {func, FunctionName}, {line, LineNumber}, {data, LogMessage}]}' +%% or `{nodedown, Node}' if the FreesSWITCH node at `Node' exits. +%% +%% The function specified by `Module':`Function' should be tail recursive and is +%% passed one argument; the name of the FreeSWITCH node. +%% +%% Subsequent calls to this function for the same node replaces the +%% previous event handler with the newly spawned one. +%% +%% This function returns either `{ok, Pid}' where `Pid' is the pid of the newly +%% spawned process, `{error, Reason}' or the atom `timeout' if FreeSWITCH did +%% not respond. +start_log_handler(Node, Module, Function) -> + start_handler(Node, register_log_handler, Module, Function). + +%% @todo Notify the process if it gets replaced with a new event handler. + +%% @doc Spawn Module:Function as an event handler. The process will receive +%% messages of the form `{event, [UniqueID, {Key, Value}, {...}]}' where +%% `UniqueID' is either a FreeSWITCH call ID or `undefined' or +%% `{nodedown, Node}' if the FreeSWITCH node at `Node' exits. +%% +%% The function specified by `Module':`Function' should be tail recursive and is +%% passed one argument; the name of the FreeSWITCH node. +%% +%% Subsequent calls to this function for the same node replaces the +%% previous event handler with the newly spawned one. +%% +%% This function returns either `{ok, Pid}' where `Pid' is the pid of the newly +%% spawned process, `{error, Reason}' or the atom `timeout' if FreeSWITCH did +%% not respond. +start_event_handler(Node, Module, Function) -> + start_handler(Node, register_event_handler, Module, Function). + +%% @doc Spawn Module:Function as an XML config fetch handler for configs of type +%% `Section'. See the FreeSWITCH documentation for mod_xml_rpc for more +%% information on sections. The process will receive messages of the form +%% `{fetch, Section, Tag, Key, Value, ID, Data}' or `{nodedown, Node}' if the +%% FreeSWITCH node at `Node' exits. +%% +%% The function specified by `Module':`Function' should be tail recursive and is +%% passed one argument; the name of the FreeSWITCH node. The function should +%% send tuples back to FreeSWITCH of the form `{fetch_reply, ID, XML}' where +%%`ID' is the ID received in the request tuple and `XML' is XML in string or +%% binary form of the form noted in the mod_xml_rpc documentation. +%% +%% Subsequent calls to this function for the same node and section will yield +%% undefined behaviour. +%% +%% This function returns either `{ok, Pid}' where `Pid' is the pid of the newly +%% spawned process, `{error, Reason}' or the atom `timeout' if FreeSWITCH did +%% not respond. +start_fetch_handler(Node, Section, Module, Function) -> + start_handler(Node, {bind, Section}, Module, Function).

1 0

[commit] r11524 - in freeswitch/trunk/libs/apr: . build
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mikej Date: Tue Jan 27 17:58:49 2009 New Revision: 11524 Log: libapr: fix configure when -Werror is in CFLAGS Modified: freeswitch/trunk/libs/apr/build/apr_common.m4 freeswitch/trunk/libs/apr/build/apr_network.m4 freeswitch/trunk/libs/apr/build/apr_threads.m4 freeswitch/trunk/libs/apr/configure.in Modified: freeswitch/trunk/libs/apr/build/apr_common.m4 ============================================================================== --- freeswitch/trunk/libs/apr/build/apr_common.m4 (original) +++ freeswitch/trunk/libs/apr/build/apr_common.m4 Tue Jan 27 17:58:49 2009 @@ -461,7 +461,9 @@ AC_CACHE_VAL(AC_CV_NAME, [AC_TRY_RUN([#include <stdio.h> $1 -main() +#include <stdlib.h> + +int main(void) { FILE *f=fopen("conftestval","w"); if (!f) exit(1); @@ -517,7 +519,7 @@ #include <errno.h> #include <string.h> #include <stdio.h> -main() +int main(void) { char buf[1024]; if (strerror_r(ERANGE, buf, sizeof buf) < 1) { @@ -942,7 +944,7 @@ dnl <sys/types.h> should be available everywhere! cat > conftest.c <<EOF #include <sys/types.h> - int main() { return 0; } + int main(void) { return 0; } EOF MKDEP="true" for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do Modified: freeswitch/trunk/libs/apr/build/apr_network.m4 ============================================================================== --- freeswitch/trunk/libs/apr/build/apr_network.m4 (original) +++ freeswitch/trunk/libs/apr/build/apr_network.m4 Tue Jan 27 17:58:49 2009 @@ -41,7 +41,7 @@ #include <sys/socket.h> #endif -void main(void) { +int main(void) { struct addrinfo hints, *ai; int error; @@ -129,7 +129,7 @@ #include <netinet/in.h> #endif -void main(void) { +int main(void) { struct sockaddr_in sa; char hbuf[256]; int error; @@ -172,7 +172,7 @@ #include <netdb.h> #endif -void main(void) { +int main(void) { if (EAI_ADDRFAMILY < 0) { exit(0); } Modified: freeswitch/trunk/libs/apr/build/apr_threads.m4 ============================================================================== --- freeswitch/trunk/libs/apr/build/apr_threads.m4 (original) +++ freeswitch/trunk/libs/apr/build/apr_threads.m4 Tue Jan 27 17:58:49 2009 @@ -100,7 +100,7 @@ return data; } -int main() { +int main(void) { pthread_t thd; pthread_mutexattr_t mattr; pthread_once_t once_init = PTHREAD_ONCE_INIT; @@ -228,7 +228,7 @@ #include <pthread.h> #include <stdlib.h> -int main() { +int main(void) { pthread_mutexattr_t attr; pthread_mutex_t m; Modified: freeswitch/trunk/libs/apr/configure.in ============================================================================== --- freeswitch/trunk/libs/apr/configure.in (original) +++ freeswitch/trunk/libs/apr/configure.in Tue Jan 27 17:58:49 2009 @@ -455,7 +455,7 @@ #include <stdio.h> #include <unistd.h> -void main(void) +int main(void) { int fd, ret = 0; struct stat64 st;

1 0

[commit] r11523 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: brian Date: Tue Jan 27 17:34:43 2009 New Revision: 11523 Log: MINTWO flag to kick both out if its two Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Jan 27 17:34:43 2009 @@ -140,7 +140,8 @@ MFLAG_ENDCONF = (1 << 9), MFLAG_HAS_AUDIO = (1 << 10), MFLAG_TALKING = (1 << 11), - MFLAG_RESTART = (1 << 12) + MFLAG_RESTART = (1 << 12), + MFLAG_MINTWO = (1 << 13) } member_flag_t; typedef enum { @@ -4307,6 +4308,10 @@ if (strstr(flags, "endconf")) { *f |= MFLAG_ENDCONF; } + + if (strstr(flags, "mintwo")) { + *f |= MFLAG_MINTWO; + } } } @@ -4815,6 +4820,10 @@ set_mflags(flags_str, &mflags); switch_set_flag_locked((&member), MFLAG_RUNNING | mflags); + if (mflags & MFLAG_MINTWO) { + conference->min = 2; + } + /* Add the caller to the conference */ if (conference_add_member(conference, &member) != SWITCH_STATUS_SUCCESS) { switch_core_codec_destroy(&member.read_codec);

1 0

[commit] r11522 - freeswitch/trunk/libs/js/src
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mikej Date: Tue Jan 27 17:20:23 2009 New Revision: 11522 Log: libjs: fix build warning under gcc 4.3 Modified: freeswitch/trunk/libs/js/src/jsapi.c freeswitch/trunk/libs/js/src/jsdbgapi.c Modified: freeswitch/trunk/libs/js/src/jsapi.c ============================================================================== --- freeswitch/trunk/libs/js/src/jsapi.c (original) +++ freeswitch/trunk/libs/js/src/jsapi.c Tue Jan 27 17:20:23 2009 @@ -4574,12 +4574,13 @@ #if JS_HAS_REGEXPS jschar *chars; JSObject *obj; + size_t slength = length; CHECK_REQUEST(cx); - chars = js_InflateString(cx, bytes, &length); + chars = js_InflateString(cx, bytes, &slength); if (!chars) return NULL; - obj = js_NewRegExpObject(cx, NULL, chars, length, flags); + obj = js_NewRegExpObject(cx, NULL, chars, slength, flags); JS_free(cx, chars); return obj; #else Modified: freeswitch/trunk/libs/js/src/jsdbgapi.c ============================================================================== --- freeswitch/trunk/libs/js/src/jsdbgapi.c (original) +++ freeswitch/trunk/libs/js/src/jsdbgapi.c Tue Jan 27 17:20:23 2009 @@ -939,11 +939,12 @@ { jschar *chars; JSBool ok; + size_t slength = length; - chars = js_InflateString(cx, bytes, &length); + chars = js_InflateString(cx, bytes, &slength); if (!chars) return JS_FALSE; - ok = JS_EvaluateUCInStackFrame(cx, fp, chars, length, filename, lineno, + ok = JS_EvaluateUCInStackFrame(cx, fp, chars, slength, filename, lineno, rval); JS_free(cx, chars);

1 0

[commit] r11521 - freeswitch/trunk/libs/js/src
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mikej Date: Tue Jan 27 17:15:42 2009 New Revision: 11521 Log: libjs: fix build warning under gcc 4.3 Modified: freeswitch/trunk/libs/js/src/jsapi.c Modified: freeswitch/trunk/libs/js/src/jsapi.c ============================================================================== --- freeswitch/trunk/libs/js/src/jsapi.c (original) +++ freeswitch/trunk/libs/js/src/jsapi.c Tue Jan 27 17:15:42 2009 @@ -4076,12 +4076,13 @@ { jschar *chars; JSBool ok; + size_t slength = length; CHECK_REQUEST(cx); - chars = js_InflateString(cx, bytes, &length); + chars = js_InflateString(cx, bytes, &slength); if (!chars) return JS_FALSE; - ok = JS_EvaluateUCScript(cx, obj, chars, length, filename, lineno, rval); + ok = JS_EvaluateUCScript(cx, obj, chars, slength, filename, lineno, rval); JS_free(cx, chars); return ok; } @@ -4095,12 +4096,13 @@ { jschar *chars; JSBool ok; + size_t slength = length; CHECK_REQUEST(cx); - chars = js_InflateString(cx, bytes, &length); + chars = js_InflateString(cx, bytes, &slength); if (!chars) return JS_FALSE; - ok = JS_EvaluateUCScriptForPrincipals(cx, obj, principals, chars, length, + ok = JS_EvaluateUCScriptForPrincipals(cx, obj, principals, chars, slength, filename, lineno, rval); JS_free(cx, chars); return ok;

1 0

[commit] r11518 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mikej Date: Tue Jan 27 16:59:00 2009 New Revision: 11518 Log: sofia-sip: fix gcc 4.3 build (FSBUILD-105) Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jan 27 16:59:00 2009 @@ -1 +1 @@ -Thur Jan 20 17:23:18 CST 2009 +Tue Jan 27 15:54:10 MST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c Tue Jan 27 16:59:00 2009 @@ -211,17 +211,18 @@ issize_t sl_payload_print(FILE *stream, char const *prefix, sip_payload_t const *pl) { char *s = pl->pl_data, *end = pl->pl_data + pl->pl_len; - size_t n, total = 0, crlf = 1; + size_t n, total = 0, crlf = 1, actual; while (s < end && *s != '\0') { n = strncspn(s, end - s, "\r\n"); crlf = strnspn(s + n, end - s - n, "\r\n"); if (prefix) fputs(prefix, stream), total += strlen(prefix); - if (fwrite(s, 1, n + crlf, stream) < 0) - return -1; - s += n + crlf; - total += n + crlf; + actual = fwrite(s, 1, n + crlf, stream) ; + if (actual == 0) + return -1; + s += actual; + total += actual; } if (crlf == 0) fputs("\n", stream), total++;

1 0