Menu
▾
▴
openvrml-commit — Changes to OpenVRML's source revision repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
| 2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
| 2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
| 2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
| 2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
| 2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Braden M. <br...@us...> - 2007-03-15 21:46:08
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22537/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Check result of curl_easy_getinfo with OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** player.cpp 13 Mar 2007 07:38:26 -0000 1.1.2.16 --- player.cpp 15 Mar 2007 21:46:05 -0000 1.1.2.17 *************** *** 753,759 **** const char * type = 0; ! CURLcode result = curl_easy_getinfo(stream_data.handle(), ! CURLINFO_CONTENT_TYPE, &type); ! boost::ignore_unused_variable_warning(result); GnomeVFSFileInfo * info = 0; --- 753,760 ---- const char * type = 0; ! CURLcode getinfo_result = ! curl_easy_getinfo(stream_data.handle(), ! CURLINFO_CONTENT_TYPE, &type); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(getinfo_result, 0); GnomeVFSFileInfo * info = 0; *************** *** 786,792 **** command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; ! ! const char * data; ! for (data = static_cast<char *>(ptr); data != static_cast<char *>(ptr) + size * nmemb; ++data) { --- 787,791 ---- command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; ! for (const char * data = static_cast<char *>(ptr); data != static_cast<char *>(ptr) + size * nmemb; ++data) { |
|
From: Braden M. <br...@us...> - 2007-03-15 21:46:08
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22537 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Check result of curl_easy_getinfo with OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.139 retrieving revision 1.1310.2.140 diff -C2 -d -r1.1310.2.139 -r1.1310.2.140 *** ChangeLog 13 Mar 2007 07:38:25 -0000 1.1310.2.139 --- ChangeLog 15 Mar 2007 21:46:04 -0000 1.1310.2.140 *************** *** 1,2 **** --- 1,9 ---- + 2007-03-15 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp + (openvrml_player_curl_write(void *, size_t, size_t, void *)): + Check result of curl_easy_getinfo with + OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR. + 2007-03-13 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-03-13 07:38:43
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19372/src/openvrml-player Modified Files: player.cpp Log Message: Set CURLOPT_FAILONERROR to "true" for easy handles. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** player.cpp 13 Mar 2007 07:23:15 -0000 1.16 --- player.cpp 13 Mar 2007 07:38:37 -0000 1.17 *************** *** 690,704 **** CURLcode setopt_result; setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); CURLSource * const curl_source = --- 690,711 ---- CURLcode setopt_result; setopt_result = curl_easy_setopt(handle, + CURLOPT_FAILONERROR, true); + OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, + false); + setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, ! false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, ! false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, ! false); CURLSource * const curl_source = |
|
From: Braden M. <br...@us...> - 2007-03-13 07:38:43
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19372 Modified Files: ChangeLog Log Message: Set CURLOPT_FAILONERROR to "true" for easy handles. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1463 retrieving revision 1.1464 diff -C2 -d -r1.1463 -r1.1464 *** ChangeLog 13 Mar 2007 07:23:15 -0000 1.1463 --- ChangeLog 13 Mar 2007 07:38:37 -0000 1.1464 *************** *** 2,5 **** --- 2,12 ---- * src/openvrml-player/player.cpp + (openvrml_player_request_data_available(GIOChannel *, + GIOCondition, gpointer)): Set CURLOPT_FAILONERROR to "true" for + easy handles. + + 2007-03-13 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp (main(int, char *[])): Call g_set_application_name. |
|
From: Braden M. <br...@us...> - 2007-03-13 07:38:27
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19340/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Set CURLOPT_FAILONERROR to "true" for easy handles. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** player.cpp 13 Mar 2007 07:22:08 -0000 1.1.2.15 --- player.cpp 13 Mar 2007 07:38:26 -0000 1.1.2.16 *************** *** 690,704 **** CURLcode setopt_result; setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); CURLSource * const curl_source = --- 690,711 ---- CURLcode setopt_result; setopt_result = curl_easy_setopt(handle, + CURLOPT_FAILONERROR, true); + OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, + false); + setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, ! false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, ! false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, ! false); CURLSource * const curl_source = |
|
From: Braden M. <br...@us...> - 2007-03-13 07:38:27
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19340 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Set CURLOPT_FAILONERROR to "true" for easy handles. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.138 retrieving revision 1.1310.2.139 diff -C2 -d -r1.1310.2.138 -r1.1310.2.139 *** ChangeLog 13 Mar 2007 07:22:07 -0000 1.1310.2.138 --- ChangeLog 13 Mar 2007 07:38:25 -0000 1.1310.2.139 *************** *** 2,5 **** --- 2,12 ---- * src/openvrml-player/player.cpp + (openvrml_player_request_data_available(GIOChannel *, + GIOCondition, gpointer)): Set CURLOPT_FAILONERROR to "true" for + easy handles. + + 2007-03-13 Braden McDaniel <br...@en...> + + * src/openvrml-player/player.cpp (main(int, char *[])): Call g_set_application_name. |
|
From: Braden M. <br...@us...> - 2007-03-13 07:23:52
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13394/src/openvrml-player Modified Files: player.cpp Log Message: Call g_set_application_name. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** player.cpp 13 Mar 2007 04:26:20 -0000 1.15 --- player.cpp 13 Mar 2007 07:23:15 -0000 1.16 *************** *** 160,163 **** --- 160,165 ---- using boost::ref; + g_set_application_name(app_name); + if (!gnome_vfs_init()) { g_critical("GnomeVFS initialization failed"); |
|
From: Braden M. <br...@us...> - 2007-03-13 07:23:52
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13394 Modified Files: ChangeLog Log Message: Call g_set_application_name. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1462 retrieving revision 1.1463 diff -C2 -d -r1.1462 -r1.1463 *** ChangeLog 13 Mar 2007 04:26:19 -0000 1.1462 --- ChangeLog 13 Mar 2007 07:23:15 -0000 1.1463 *************** *** 1,4 **** --- 1,9 ---- 2007-03-13 Braden McDaniel <br...@en...> + * src/openvrml-player/player.cpp + (main(int, char *[])): Call g_set_application_name. + + 2007-03-13 Braden McDaniel <br...@en...> + Use GLib-style return-if-fail macros for most of libcurl error handling. |
|
From: Braden M. <br...@us...> - 2007-03-13 07:22:32
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12764 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Call g_set_application_name. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.137 retrieving revision 1.1310.2.138 diff -C2 -d -r1.1310.2.137 -r1.1310.2.138 *** ChangeLog 13 Mar 2007 04:26:07 -0000 1.1310.2.137 --- ChangeLog 13 Mar 2007 07:22:07 -0000 1.1310.2.138 *************** *** 1,4 **** --- 1,9 ---- 2007-03-13 Braden McDaniel <br...@en...> + * src/openvrml-player/player.cpp + (main(int, char *[])): Call g_set_application_name. + + 2007-03-13 Braden McDaniel <br...@en...> + Use GLib-style return-if-fail macros for most of libcurl error handling. |
|
From: Braden M. <br...@us...> - 2007-03-13 07:22:32
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12764/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Call g_set_application_name. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** player.cpp 13 Mar 2007 04:26:08 -0000 1.1.2.14 --- player.cpp 13 Mar 2007 07:22:08 -0000 1.1.2.15 *************** *** 160,163 **** --- 160,165 ---- using boost::ref; + g_set_application_name(app_name); + if (!gnome_vfs_init()) { g_critical("GnomeVFS initialization failed"); |
|
From: Braden M. <br...@us...> - 2007-03-13 04:26:20
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8755/src/openvrml-player Modified Files: player.cpp Log Message: Use GLib-style return-if-fail macros for most of libcurl error handling. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** player.cpp 10 Feb 2007 04:31:53 -0000 1.14 --- player.cpp 13 Mar 2007 04:26:20 -0000 1.15 *************** *** 129,132 **** --- 129,156 ---- } + # define OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(code, val) \ + if G_LIKELY((code) == CURLE_OK) {} else { \ + g_return_if_fail_warning(G_LOG_DOMAIN, \ + __PRETTY_FUNCTION__, \ + curl_easy_strerror(code)); \ + return (val); \ + } + + # define OPENVRML_PLAYER_CURL_MULTI_RETURN_IF_ERROR(code) \ + if G_LIKELY((code) == CURLM_OK) {} else { \ + g_return_if_fail_warning(G_LOG_DOMAIN, \ + __PRETTY_FUNCTION__, \ + curl_multi_strerror(code)); \ + return; \ + } + + # define OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR(code, val) \ + if G_LIKELY((code) == CURLM_OK) {} else { \ + g_return_if_fail_warning(G_LOG_DOMAIN, \ + __PRETTY_FUNCTION__, \ + curl_multi_strerror(code)); \ + return (val); \ + } + int main(int argc, char * argv[]) { *************** *** 427,433 **** &curl_source.exc_fds, &curl_source.max_fd); ! if (result != CURLM_OK) { ! g_critical("%s", curl_multi_strerror(result)); ! } if (curl_source.max_fd >= 0) { --- 451,455 ---- &curl_source.exc_fds, &curl_source.max_fd); ! OPENVRML_PLAYER_CURL_MULTI_RETURN_IF_ERROR(result); if (curl_source.max_fd >= 0) { *************** *** 603,610 **** curl_multi_remove_handle(curl_source->multi_handle, easy_handle); ! if (multi_remove_result != CURLM_OK) { ! g_critical("%s", curl_multi_strerror(multi_remove_result)); ! } ! curl_easy_cleanup(easy_handle); } --- 625,635 ---- curl_multi_remove_handle(curl_source->multi_handle, easy_handle); ! OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR(multi_remove_result, ! false); ! // ! // If we get an error from curl_multi_remove_handle, the cleanup ! // won't happen; but that's probably safer than trying to go ahead ! // and do the cleanup in that case. ! // curl_easy_cleanup(easy_handle); } *************** *** 664,683 **** setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); ! if (setopt_result != CURLE_OK) { ! g_critical("%s", curl_easy_strerror(setopt_result)); ! return false; ! } setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); ! if (setopt_result != CURLE_OK) { ! g_critical("%s", curl_easy_strerror(setopt_result)); ! return false; ! } setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); ! g_assert(setopt_result == CURLE_OK); CURLSource * const curl_source = --- 689,702 ---- setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); CURLSource * const curl_source = *************** *** 688,695 **** const CURLMcode add_handle_result = curl_multi_add_handle(curl_source->multi_handle, handle); ! if (add_handle_result != CURLM_OK) { ! g_critical("%s", curl_multi_strerror(add_handle_result)); ! return false; ! } ++curl_source->outstanding_handles; std::ostringstream command; --- 707,712 ---- const CURLMcode add_handle_result = curl_multi_add_handle(curl_source->multi_handle, handle); ! OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR(add_handle_result, ! false); ++curl_source->outstanding_handles; std::ostringstream command; |
|
From: Braden M. <br...@us...> - 2007-03-13 04:26:20
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8755 Modified Files: ChangeLog Log Message: Use GLib-style return-if-fail macros for most of libcurl error handling. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1461 retrieving revision 1.1462 diff -C2 -d -r1.1461 -r1.1462 *** ChangeLog 12 Mar 2007 14:43:52 -0000 1.1461 --- ChangeLog 13 Mar 2007 04:26:19 -0000 1.1462 *************** *** 1,2 **** --- 1,22 ---- + 2007-03-13 Braden McDaniel <br...@en...> + + Use GLib-style return-if-fail macros for most of libcurl error + handling. + + * src/openvrml-player/player.cpp + (OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR): Added macro. + (OPENVRML_PLAYER_CURL_MULTI_RETURN_IF_ERROR): Added macro. + (OPENVRML_PLAYER_CULR_MULTI_RETURN_VAL_IF_ERROR): Added macro. + (reset_fds(CURLSource &)): Check result of curl_multi_fdset with + OPENVRML_PLAYER_CURL_MULTI_RETURN_IF_ERROR. + (openvrml_player_curl_source_callback(gpointer)): Check result of + curl_multi_remove_handle with + OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR. + (openvrml_player_request_data_available(GIOChannel *, + GIOCondition, gpointer)): Check result of curl_easy_setopt with + OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR; check result of + curl_multi_add_handle with + OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR. + 2007-03-12 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-03-13 04:26:09
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8690 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Use GLib-style return-if-fail macros for most of libcurl error handling. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.136 retrieving revision 1.1310.2.137 diff -C2 -d -r1.1310.2.136 -r1.1310.2.137 *** ChangeLog 12 Mar 2007 14:43:39 -0000 1.1310.2.136 --- ChangeLog 13 Mar 2007 04:26:07 -0000 1.1310.2.137 *************** *** 1,2 **** --- 1,22 ---- + 2007-03-13 Braden McDaniel <br...@en...> + + Use GLib-style return-if-fail macros for most of libcurl error + handling. + + * src/openvrml-player/player.cpp + (OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR): Added macro. + (OPENVRML_PLAYER_CURL_MULTI_RETURN_IF_ERROR): Added macro. + (OPENVRML_PLAYER_CULR_MULTI_RETURN_VAL_IF_ERROR): Added macro. + (reset_fds(CURLSource &)): Check result of curl_multi_fdset with + OPENVRML_PLAYER_CURL_MULTI_RETURN_IF_ERROR. + (openvrml_player_curl_source_callback(gpointer)): Check result of + curl_multi_remove_handle with + OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR. + (openvrml_player_request_data_available(GIOChannel *, + GIOCondition, gpointer)): Check result of curl_easy_setopt with + OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR; check result of + curl_multi_add_handle with + OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR. + 2007-03-12 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-03-13 04:26:09
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8690/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Use GLib-style return-if-fail macros for most of libcurl error handling. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** player.cpp 10 Feb 2007 04:31:44 -0000 1.1.2.13 --- player.cpp 13 Mar 2007 04:26:08 -0000 1.1.2.14 *************** *** 129,132 **** --- 129,156 ---- } + # define OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(code, val) \ + if G_LIKELY((code) == CURLE_OK) {} else { \ + g_return_if_fail_warning(G_LOG_DOMAIN, \ + __PRETTY_FUNCTION__, \ + curl_easy_strerror(code)); \ + return (val); \ + } + + # define OPENVRML_PLAYER_CURL_MULTI_RETURN_IF_ERROR(code) \ + if G_LIKELY((code) == CURLM_OK) {} else { \ + g_return_if_fail_warning(G_LOG_DOMAIN, \ + __PRETTY_FUNCTION__, \ + curl_multi_strerror(code)); \ + return; \ + } + + # define OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR(code, val) \ + if G_LIKELY((code) == CURLM_OK) {} else { \ + g_return_if_fail_warning(G_LOG_DOMAIN, \ + __PRETTY_FUNCTION__, \ + curl_multi_strerror(code)); \ + return (val); \ + } + int main(int argc, char * argv[]) { *************** *** 427,433 **** &curl_source.exc_fds, &curl_source.max_fd); ! if (result != CURLM_OK) { ! g_critical("%s", curl_multi_strerror(result)); ! } if (curl_source.max_fd >= 0) { --- 451,455 ---- &curl_source.exc_fds, &curl_source.max_fd); ! OPENVRML_PLAYER_CURL_MULTI_RETURN_IF_ERROR(result); if (curl_source.max_fd >= 0) { *************** *** 603,610 **** curl_multi_remove_handle(curl_source->multi_handle, easy_handle); ! if (multi_remove_result != CURLM_OK) { ! g_critical("%s", curl_multi_strerror(multi_remove_result)); ! } ! curl_easy_cleanup(easy_handle); } --- 625,635 ---- curl_multi_remove_handle(curl_source->multi_handle, easy_handle); ! OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR(multi_remove_result, ! false); ! // ! // If we get an error from curl_multi_remove_handle, the cleanup ! // won't happen; but that's probably safer than trying to go ahead ! // and do the cleanup in that case. ! // curl_easy_cleanup(easy_handle); } *************** *** 664,683 **** setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); ! if (setopt_result != CURLE_OK) { ! g_critical("%s", curl_easy_strerror(setopt_result)); ! return false; ! } setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); ! if (setopt_result != CURLE_OK) { ! g_critical("%s", curl_easy_strerror(setopt_result)); ! return false; ! } setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); ! g_assert(setopt_result == CURLE_OK); CURLSource * const curl_source = --- 689,702 ---- setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); ! OPENVRML_PLAYER_CURL_EASY_RETURN_VAL_IF_ERROR(setopt_result, false); CURLSource * const curl_source = *************** *** 688,695 **** const CURLMcode add_handle_result = curl_multi_add_handle(curl_source->multi_handle, handle); ! if (add_handle_result != CURLM_OK) { ! g_critical("%s", curl_multi_strerror(add_handle_result)); ! return false; ! } ++curl_source->outstanding_handles; std::ostringstream command; --- 707,712 ---- const CURLMcode add_handle_result = curl_multi_add_handle(curl_source->multi_handle, handle); ! OPENVRML_PLAYER_CURL_MULTI_RETURN_VAL_IF_ERROR(add_handle_result, ! false); ++curl_source->outstanding_handles; std::ostringstream command; |
|
From: Braden M. <br...@us...> - 2007-03-12 14:43:54
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3282 Modified Files: ChangeLog Log Message: Guard against the possibility that this function is called when the number of bytes in the backtrack buffer should remain zero. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1460 retrieving revision 1.1461 diff -C2 -d -r1.1460 -r1.1461 *** ChangeLog 6 Mar 2007 07:28:42 -0000 1.1460 --- ChangeLog 12 Mar 2007 14:43:52 -0000 1.1461 *************** *** 1,2 **** --- 1,9 ---- + 2007-03-12 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/vrml97node.cpp + (openvrml_jpeg_fill_input_buffer(j_decompress_ptr)): Guard against + the possibility that this function is called when the number of + bytes in the backtrack buffer should remain zero. + 2007-03-06 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-03-12 14:43:54
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3282/src/libopenvrml/openvrml Modified Files: vrml97node.cpp Log Message: Guard against the possibility that this function is called when the number of bytes in the backtrack buffer should remain zero. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** vrml97node.cpp 6 Mar 2007 07:24:01 -0000 1.123 --- vrml97node.cpp 12 Mar 2007 14:43:52 -0000 1.124 *************** *** 7140,7156 **** source_mgr.bytes_in_buffer + reader.bytes_in_backtrack_buffer; ! reader.backtrack_buffer.resize(bytes_now_in_backtrack_buffer); ! ! reader.backtrack_buffer.resize(bytes_now_in_backtrack_buffer); ! std::copy(source_mgr.next_input_byte, ! source_mgr.next_input_byte + source_mgr.bytes_in_buffer, ! reader.backtrack_buffer.begin() ! + reader.bytes_in_backtrack_buffer); ! source_mgr.next_input_byte = &*(reader.backtrack_buffer.begin() ! + reader.bytes_in_backtrack_buffer ! - reader.backtrack_buffer_bytes_unread); ! source_mgr.bytes_in_buffer += reader.backtrack_buffer_bytes_unread; reader.bytes_in_backtrack_buffer = bytes_now_in_backtrack_buffer; reader.reading = true; --- 7140,7157 ---- source_mgr.bytes_in_buffer + reader.bytes_in_backtrack_buffer; ! if (bytes_now_in_backtrack_buffer > 0) { ! reader.backtrack_buffer.resize(bytes_now_in_backtrack_buffer); ! std::copy(source_mgr.next_input_byte, ! source_mgr.next_input_byte + source_mgr.bytes_in_buffer, ! reader.backtrack_buffer.begin() ! + reader.bytes_in_backtrack_buffer); ! source_mgr.next_input_byte = ! &*(reader.backtrack_buffer.begin() ! + reader.bytes_in_backtrack_buffer ! - reader.backtrack_buffer_bytes_unread); ! source_mgr.bytes_in_buffer += reader.backtrack_buffer_bytes_unread; ! } reader.bytes_in_backtrack_buffer = bytes_now_in_backtrack_buffer; reader.reading = true; |
|
From: Braden M. <br...@us...> - 2007-03-12 14:43:42
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3255 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Guard against the possibility that this function is called when the number of bytes in the backtrack buffer should remain zero. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.135 retrieving revision 1.1310.2.136 diff -C2 -d -r1.1310.2.135 -r1.1310.2.136 *** ChangeLog 6 Mar 2007 07:28:29 -0000 1.1310.2.135 --- ChangeLog 12 Mar 2007 14:43:39 -0000 1.1310.2.136 *************** *** 1,2 **** --- 1,9 ---- + 2007-03-12 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/vrml97node.cpp + (openvrml_jpeg_fill_input_buffer(j_decompress_ptr)): Guard against + the possibility that this function is called when the number of + bytes in the backtrack buffer should remain zero. + 2007-03-06 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-03-12 14:43:42
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3255/src/libopenvrml/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH vrml97node.cpp Log Message: Guard against the possibility that this function is called when the number of bytes in the backtrack buffer should remain zero. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.108.2.11 retrieving revision 1.108.2.12 diff -C2 -d -r1.108.2.11 -r1.108.2.12 *** vrml97node.cpp 6 Mar 2007 07:23:12 -0000 1.108.2.11 --- vrml97node.cpp 12 Mar 2007 14:43:39 -0000 1.108.2.12 *************** *** 7140,7156 **** source_mgr.bytes_in_buffer + reader.bytes_in_backtrack_buffer; ! reader.backtrack_buffer.resize(bytes_now_in_backtrack_buffer); ! ! reader.backtrack_buffer.resize(bytes_now_in_backtrack_buffer); ! std::copy(source_mgr.next_input_byte, ! source_mgr.next_input_byte + source_mgr.bytes_in_buffer, ! reader.backtrack_buffer.begin() ! + reader.bytes_in_backtrack_buffer); ! source_mgr.next_input_byte = &*(reader.backtrack_buffer.begin() ! + reader.bytes_in_backtrack_buffer ! - reader.backtrack_buffer_bytes_unread); ! source_mgr.bytes_in_buffer += reader.backtrack_buffer_bytes_unread; reader.bytes_in_backtrack_buffer = bytes_now_in_backtrack_buffer; reader.reading = true; --- 7140,7157 ---- source_mgr.bytes_in_buffer + reader.bytes_in_backtrack_buffer; ! if (bytes_now_in_backtrack_buffer > 0) { ! reader.backtrack_buffer.resize(bytes_now_in_backtrack_buffer); ! std::copy(source_mgr.next_input_byte, ! source_mgr.next_input_byte + source_mgr.bytes_in_buffer, ! reader.backtrack_buffer.begin() ! + reader.bytes_in_backtrack_buffer); ! source_mgr.next_input_byte = ! &*(reader.backtrack_buffer.begin() ! + reader.bytes_in_backtrack_buffer ! - reader.backtrack_buffer_bytes_unread); ! source_mgr.bytes_in_buffer += reader.backtrack_buffer_bytes_unread; ! } reader.bytes_in_backtrack_buffer = bytes_now_in_backtrack_buffer; reader.reading = true; |
|
From: Braden M. <br...@us...> - 2007-03-08 06:40:15
|
Update of /cvsroot/openvrml/openvrml/doc/manual In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15144/doc/manual Modified Files: .cvsignore Log Message: Ignore include graph images. Index: .cvsignore =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/manual/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 4 Feb 2007 10:21:19 -0000 1.2 --- .cvsignore 8 Mar 2007 06:40:10 -0000 1.3 *************** *** 4,7 **** --- 4,8 ---- *.md5 *inherit__graph*.png + *__incl.png doxygen.png form_*.png |
|
From: Braden M. <br...@us...> - 2007-03-08 06:39:51
|
Update of /cvsroot/openvrml/openvrml/doc/manual In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15034/doc/manual Modified Files: Tag: OpenVRML-0_16-BRANCH .cvsignore Log Message: Ignore include graph images. Index: .cvsignore =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/manual/.cvsignore,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** .cvsignore 4 Feb 2007 10:21:04 -0000 1.1.2.1 --- .cvsignore 8 Mar 2007 06:39:51 -0000 1.1.2.2 *************** *** 4,7 **** --- 4,8 ---- *.md5 *inherit__graph*.png + *__incl.png doxygen.png form_*.png |
|
From: Braden M. <br...@us...> - 2007-03-06 07:29:06
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14274 Modified Files: ChangeLog Log Message: Set SHOW_INCLUDE_FILES to YES; required to show what header file a class is defined in. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1459 retrieving revision 1.1460 diff -C2 -d -r1.1459 -r1.1460 *** ChangeLog 6 Mar 2007 07:24:00 -0000 1.1459 --- ChangeLog 6 Mar 2007 07:28:42 -0000 1.1460 *************** *** 1,4 **** --- 1,9 ---- 2007-03-06 Braden McDaniel <br...@en...> + * doc/Doxyfile: Set SHOW_INCLUDE_FILES to YES; required to show + what header file a class is defined in. + + 2007-03-06 Braden McDaniel <br...@en...> + Doc-comment improvements. |
|
From: Braden M. <br...@us...> - 2007-03-06 07:29:06
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14249 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Set SHOW_INCLUDE_FILES to YES; required to show what header file a class is defined in. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.134 retrieving revision 1.1310.2.135 diff -C2 -d -r1.1310.2.134 -r1.1310.2.135 *** ChangeLog 6 Mar 2007 07:23:10 -0000 1.1310.2.134 --- ChangeLog 6 Mar 2007 07:28:29 -0000 1.1310.2.135 *************** *** 1,4 **** --- 1,9 ---- 2007-03-06 Braden McDaniel <br...@en...> + * doc/Doxyfile: Set SHOW_INCLUDE_FILES to YES; required to show + what header file a class is defined in. + + 2007-03-06 Braden McDaniel <br...@en...> + Doc-comment improvements. |
|
From: Braden M. <br...@us...> - 2007-03-06 07:29:06
|
Update of /cvsroot/openvrml/openvrml/doc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14249/doc Modified Files: Tag: OpenVRML-0_16-BRANCH Doxyfile Log Message: Set SHOW_INCLUDE_FILES to YES; required to show what header file a class is defined in. Index: Doxyfile =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/Doxyfile,v retrieving revision 1.23.2.3 retrieving revision 1.23.2.4 diff -C2 -d -r1.23.2.3 -r1.23.2.4 *** Doxyfile 30 Dec 2006 23:37:07 -0000 1.23.2.3 --- Doxyfile 6 Mar 2007 07:28:29 -0000 1.23.2.4 *************** *** 46,50 **** CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO ! SHOW_INCLUDE_FILES = NO INLINE_INFO = YES SORT_MEMBER_DOCS = NO --- 46,50 ---- CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO ! SHOW_INCLUDE_FILES = YES INLINE_INFO = YES SORT_MEMBER_DOCS = NO *************** *** 190,193 **** --- 190,194 ---- INCLUDE_FILE_PATTERNS = PREDEFINED = BOOST_CLASS_REQUIRE(a,b,c)= \ + OPENVRML_ENABLE_RENDER_TEXT_NODE= \ OPENVRML_API= \ OPENVRML_LOCAL= \ |
|
From: Braden M. <br...@us...> - 2007-03-06 07:29:06
|
Update of /cvsroot/openvrml/openvrml/doc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14274/doc Modified Files: Doxyfile Log Message: Set SHOW_INCLUDE_FILES to YES; required to show what header file a class is defined in. Index: Doxyfile =================================================================== RCS file: /cvsroot/openvrml/openvrml/doc/Doxyfile,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Doxyfile 30 Dec 2006 23:37:43 -0000 1.26 --- Doxyfile 6 Mar 2007 07:28:42 -0000 1.27 *************** *** 46,50 **** CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO ! SHOW_INCLUDE_FILES = NO INLINE_INFO = YES SORT_MEMBER_DOCS = NO --- 46,50 ---- CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO ! SHOW_INCLUDE_FILES = YES INLINE_INFO = YES SORT_MEMBER_DOCS = NO *************** *** 190,193 **** --- 190,194 ---- INCLUDE_FILE_PATTERNS = PREDEFINED = BOOST_CLASS_REQUIRE(a,b,c)= \ + OPENVRML_ENABLE_RENDER_TEXT_NODE= \ OPENVRML_API= \ OPENVRML_LOCAL= \ |
|
From: Braden M. <br...@us...> - 2007-03-06 07:24:08
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12313 Modified Files: ChangeLog Log Message: Doc-comment improvements. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1458 retrieving revision 1.1459 diff -C2 -d -r1.1458 -r1.1459 *** ChangeLog 6 Mar 2007 03:26:15 -0000 1.1458 --- ChangeLog 6 Mar 2007 07:24:00 -0000 1.1459 *************** *** 1,2 **** --- 1,26 ---- + 2007-03-06 Braden McDaniel <br...@en...> + + Doc-comment improvements. + + * src/libopenvrml/openvrml/basetypes.cpp + * src/libopenvrml/openvrml/basetypes.h + * src/libopenvrml/openvrml/bounding_volume.cpp + * src/libopenvrml/openvrml/browser.cpp + * src/libopenvrml/openvrml/event.cpp + * src/libopenvrml/openvrml/event.h + * src/libopenvrml/openvrml/exposedfield.cpp + * src/libopenvrml/openvrml/field_value.cpp + * src/libopenvrml/openvrml/frustum.cpp + * src/libopenvrml/openvrml/node.cpp + * src/libopenvrml/openvrml/node.h + * src/libopenvrml/openvrml/node_impl_util.cpp + * src/libopenvrml/openvrml/rendering_context.cpp + * src/libopenvrml/openvrml/scope.cpp + * src/libopenvrml/openvrml/script.cpp + * src/libopenvrml/openvrml/viewer.cpp + * src/libopenvrml/openvrml/viewer.h + * src/libopenvrml/openvrml/vrml97node.cpp + * src/libopenvrml-gl/openvrml/gl/viewer.cpp + 2007-03-05 Braden McDaniel <br...@en...> |
