X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=octopi%2Fapplications%2Ftransporter%2Ftransporter.cpp;fp=octopi%2Fapplications%2Ftransporter%2Ftransporter.cpp;h=3da636d9cdf592a184a9cafe5a807701baf74f4d;hb=d7e8a05960951d8ce67e36c587726a851e2f5165;hp=b597a62461875f12cf70076b5fdcb669ff773305;hpb=fa30e6adff1dea5d6b3903279ef024dd3bed043f;p=feisty_meow.git diff --git a/octopi/applications/transporter/transporter.cpp b/octopi/applications/transporter/transporter.cpp index b597a624..3da636d9 100644 --- a/octopi/applications/transporter/transporter.cpp +++ b/octopi/applications/transporter/transporter.cpp @@ -93,8 +93,8 @@ private: transporter::transporter() : application_shell(), _saw_clients(false), - _server_side(NIL), - _client_side(NIL), + _server_side(NULL_POINTER), + _client_side(NULL_POINTER), _leave_when_no_clients(false), _encryption(false), _started_okay(false) @@ -278,7 +278,7 @@ int transporter::push_client_download() non_continuable_error(class_name(), func, astring("failed to initiate " " the transfer: ") + cromp_client::outcome_name(start_ret)); - infoton *start_reply_tmp = NIL; + infoton *start_reply_tmp = NULL_POINTER; //hmmm: set timeout appropriate to the speed of the connection! outcome first_receipt = _client_side->acquire(start_reply_tmp, cmd_id); if (first_receipt != cromp_client::OKAY) @@ -320,7 +320,7 @@ LOG(a_sprintf("ongoing chunk %d", ++iter)); non_continuable_error(class_name(), func, astring("failed to send ongoing " "chunk: ") + cromp_client::outcome_name(place_ret)); - infoton *place_reply_tmp = NIL; + infoton *place_reply_tmp = NULL_POINTER; //hmmm: set timeout appropriate to the speed of the connection! outcome place_receipt = _client_side->acquire(place_reply_tmp, cmd_id); if (place_receipt != cromp_client::OKAY)