From: Dmitry Y. <di...@us...> - 2002-05-24 08:06:46
|
Update of /cvsroot/firebird/firebird2/src/remote In directory usw-pr-cvs1:/tmp/cvs-serv27521 Modified Files: interface.cpp Log Message: Fixed serious porting error. Index: interface.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/remote/interface.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -U3 -r1.10 -r1.11 --- interface.cpp 4 Apr 2002 16:08:18 -0000 1.10 +++ interface.cpp 24 May 2002 08:06:42 -0000 1.11 @@ -477,8 +477,6 @@ release_blob(blob); *blob_handle = NULL; - - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { @@ -530,7 +528,6 @@ if (event = find_event(port, *id)) { send_cancel_event(event); } - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { @@ -585,7 +582,6 @@ release_blob(blob); *blob_handle = NULL; - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { @@ -632,13 +628,12 @@ REMOTE_cleanup_transaction(transaction); release_transaction(transaction); *rtr_handle = NULL; - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { return error(user_status); } - + RETURN_SUCCESS; } @@ -680,7 +675,6 @@ if (!release_object(rdb, op_commit_retaining, transaction->rtr_id)) { return error(user_status); } - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { @@ -794,7 +788,6 @@ message->msg_address = NULL; } - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { @@ -871,7 +864,6 @@ SET_OBJECT(rdb, blob, blob->rbl_id); blob->rbl_next = transaction->rtr_blobs; transaction->rtr_blobs = blob; - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { @@ -990,7 +982,6 @@ } *handle = rdb; - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { @@ -1135,7 +1126,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -1218,7 +1208,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -1292,7 +1281,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -1360,7 +1348,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -1566,7 +1553,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -1788,7 +1774,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -2057,9 +2042,9 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } + RETURN_SUCCESS; } @@ -2129,12 +2114,9 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; - RETURN_SUCCESS; } @@ -2233,12 +2215,9 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; - RETURN_SUCCESS; } @@ -2339,10 +2318,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -2424,10 +2401,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -2477,7 +2452,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -2715,7 +2689,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -2824,10 +2797,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -2897,10 +2868,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -2963,10 +2932,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -3060,10 +3027,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -3155,10 +3120,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -3271,10 +3234,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -3523,10 +3484,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -3576,10 +3535,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -3622,10 +3579,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -3778,10 +3733,8 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } - RESTORE_THREAD_DATA; RETURN_SUCCESS; } @@ -3822,11 +3775,9 @@ REMOTE_cleanup_transaction(transaction); release_transaction(transaction); *rtr_handle = NULL; - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -3890,11 +3841,9 @@ blob->rbl_length = 0; blob->rbl_fragment_length = 0; blob->rbl_flags &= ~(RBL_eof | RBL_eof_pending | RBL_segment); - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -3961,11 +3910,9 @@ if (!receive_response(rdb, packet)) { return error(user_status); } - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -4082,11 +4029,9 @@ } *handle = rdb; - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -4138,7 +4083,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -4356,11 +4300,9 @@ { receive_after_start(request, packet->p_resp.p_resp_object); } - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -4439,7 +4381,6 @@ } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -4490,11 +4431,9 @@ } *rtr_handle = make_transaction(rdb, packet->p_resp.p_resp_object); - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } @@ -4636,11 +4575,9 @@ return error(user_status); } } - RESTORE_THREAD_DATA; } catch (const Firebird::status_exception& e) { - RESTORE_THREAD_DATA; return error(user_status); } |