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) { |