Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[57912] firebird/trunk
|
From: <ma...@us...> - 2013-04-06 17:58:37
|
Revision: 57912
http://sourceforge.net/p/firebird/code/57912
Author: mapopa
Date: 2013-04-06 17:58:35 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Remove unused and broken code defined with PIGGYBACK
Modified Paths:
--------------
firebird/trunk/doc/emacros-cross_ref.html
firebird/trunk/src/remote/inet.cpp
Modified: firebird/trunk/doc/emacros-cross_ref.html
===================================================================
--- firebird/trunk/doc/emacros-cross_ref.html 2013-04-06 17:46:27 UTC (rev 57911)
+++ firebird/trunk/doc/emacros-cross_ref.html 2013-04-06 17:58:35 UTC (rev 57912)
@@ -236,17 +236,6 @@
used in remote\window.cpp(481) with #ifdef <br>
</td></tr>
<tr><td valign="top">
-(16) ISC_DATABASE_ENCRYPTION</td><td> </td></tr>
-<tr><td> </td><td>
-used in jrd\jrd.cpp(5248) with #ifdef <br>
-used in jrd\unix.cpp(480) with #ifdef <br>
-used in jrd\unix.cpp(743) with #ifdef <br>
-used in jrd\unix.cpp(838) with #ifdef <br>
-used in jrd\vms.cpp(346) with #ifdef <br>
-used in jrd\vms.cpp(547) with #ifdef <br>
-used in jrd\vms.cpp(618) with #ifdef <br>
-</td></tr>
-<tr><td valign="top">
(17) MANAGER_PROCESS</td><td> </td></tr>
<tr><td> </td><td>
used in lock\lock.cpp(105) with #ifdef <br>
@@ -438,12 +427,6 @@
used in qli\show.epp(1834) with #ifdef <br>
</td></tr>
<tr><td valign="top">
-(22) PIGGYBACK</td><td> </td></tr>
-<tr><td> </td><td>
-used in remote\inet.cpp(3432) with #ifdef <br>
-used in remote\inet.cpp(3462) with #ifdef <br>
-</td></tr>
-<tr><td valign="top">
(23) REPLAY_OSRI_API_CALLS_SUBSYSTEM</td><td>System to reply requests, usable for debug. Not complete.</td></tr>
<tr><td> </td><td>
used in jrd\blb.cpp(88) with #ifdef <br>
@@ -2685,69 +2668,6 @@
used in utilities\drop.cpp(357) with #if<br>
</td></tr>
<tr><td valign="top">
-(12) SCO</td><td> </td></tr>
-<tr><td> </td><td>
-used in jrd\isc_file.cpp(267) with #ifndef<br>
-used in jrd\shdef.h(87) with #ifndef<br>
-used in jrd\shrinit.cpp(34) with #ifndef<br>
-used in jrd\shrinit.cpp(87) with #ifndef<br>
-used in jrd\shrinit.cpp(98) with #ifndef<br>
-used in jrd\shrinit.cpp(130) with #ifndef<br>
-used in jrd\shrinit.cpp(169) with #ifndef<br>
-used in jrd\shrinit.cpp(179) with #ifndef<br>
-used in jrd\shrinit.cpp(189) with #ifdef <br>
-used in jrd\shrinit.cpp(195) with #ifndef<br>
-used in jrd\shrinit.cpp(200) with #ifdef <br>
-used in jrd\shrinit.cpp(220) with #ifdef <br>
-used in jrd\shrinit.cpp(236) with #ifdef <br>
-used in remote\inet.cpp(491) with #ifndef<br>
-used in remote\inet.cpp(526) with #ifndef<br>
-</td></tr>
-<tr><td valign="top">
-(13) SCO_EV</td><td> </td></tr>
-<tr><td> </td><td>
-used in jrd\flu.cpp(100) with #if<br>
-used in jrd\isc.cpp(83) with #ifdef <br>
-used in jrd\isc.cpp(329) with #if<br>
-used in jrd\isc_ipc.cpp(94) with #ifdef <br>
-used in remote\remote_def.h(67) with #ifdef <br>
-used in utilities\drop.cpp(306) with #ifdef <br>
-</td></tr>
-<tr><td valign="top">
-(14) SCO_UNIX</td><td> </td></tr>
-<tr><td> </td><td>
-used in gpre\gpre.h(79) with #if<br>
-used in journal\console.cpp(34) with #ifdef <br>
-used in jrd\cvt.cpp(83) with #ifdef <br>
-used in jrd\isc_file.cpp(167) with #ifdef <br>
-used in jrd\isc_file.cpp(1432) with #ifdef <br>
-used in jrd\jio.cpp(58) with #ifdef <br>
-used in jrd\svc.cpp(98) with #ifdef <br>
-used in lock\lock.h(83) with #ifdef <br>
-used in remote\inet.cpp(122) with #if<br>
-</td></tr>
-<tr><td valign="top">
-(15) SINIXZ</td><td> </td></tr>
-<tr><td> </td><td>
-used in common\config\config.cpp(71) with #ifdef <br>
-used in gpre\cob.cpp(160) with #ifdef <br>
-used in gpre\ftn.cpp(256) with #ifdef <br>
-used in jrd\flu.cpp(100) with #if<br>
-used in jrd\flu.cpp(228) with #if<br>
-used in jrd\isc_file.cpp(203) with #if<br>
-used in jrd\isc_file.cpp(587) with #if<br>
-used in jrd\isc_file.cpp(1018) with #if<br>
-used in jrd\isc_ipc.cpp(222) with #ifdef <br>
-used in jrd\isc_ipc.cpp(1023) with #ifdef <br>
-used in jrd\license.h(123) with #ifdef <br>
-used in jrd\pag.cpp(168) with #ifdef <br>
-used in jrd\why.cpp(518) with #ifndef<br>
-used in lock\lock.h(87) with #ifdef <br>
-used in remote\inet.cpp(2398) with #if<br>
-used in remote\inet.cpp(2427) with #if<br>
-used in utilities\drop.cpp(357) with #if<br>
-</td></tr>
-<tr><td valign="top">
(16) SOLARIS</td><td> </td></tr>
<tr><td> </td><td>
used in common\classes\locks.h(12) with #ifndef<br>
Modified: firebird/trunk/src/remote/inet.cpp
===================================================================
--- firebird/trunk/src/remote/inet.cpp 2013-04-06 17:46:27 UTC (rev 57911)
+++ firebird/trunk/src/remote/inet.cpp 2013-04-06 17:58:35 UTC (rev 57912)
@@ -2767,56 +2767,6 @@
return TRUE;
-#ifdef PIGGYBACK
- // CVC: Screwed logic here: if I initialize l2 to zero, nothing useful executes.
- SCHAR aux_buffer[BUFFER_SIZE];
- SSHORT l2 = 0;
-#error Assign l2 some meaningful value before running this.
- // If the other end has not piggy-backed the next packet, we're done.
-
- if (!l2)
- return TRUE;
-
- // We've got a piggy-backed response. If the packet is partial,
- // send an ACK for part we did receive.
-
- char* p2 = aux_buffer;
-
- while (l2 < 0)
- {
- if (!packet_send(port, 0, 0))
- return FALSE;
- p2 -= l2;
- length = aux_buffer + sizeof(aux_buffer) - p2;
- if (!packet_receive(port, p2, length, &l2))
- {
- p2 += l2;
- continue;
- }
- }
-
- length = p2 - aux_buffer + l2;
-
- // Now we're got a encode glump ready to stuff into the read buffer.
- // Unfortunately, if we just add it to the read buffer, we will shortly
- // overflow the buffer. To avoid this, "scrumpf down" the active bits
- // in the read buffer, then add out stuff at the end.
-
- xdrs = &port->port_receive;
- p2 = xdrs->x_base;
-
- if (xdrs->x_handy && p2 != xdrs->x_private) {
- memmove(p2, xdrs->x_private, xdrs->x_handy);
- }
-
- p2 += xdrs->x_handy;
-
- xdrs->x_private = xdrs->x_base;
-
- // xdrs->x_handy += JAP_decode (aux_buffer, length, p2);
-
- return TRUE;
-#endif
}
#ifdef DEBUG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
