From dabf62003ec4a2d31f5b276650b1554db840601a Mon Sep 17 00:00:00 2001
From: Kyle Galloway <kgallowa@redhat.com>
Date: Thu, 5 Apr 2007 00:00:45 +0000
Subject: [PATCH] VariableTable.java: Change longs to ints for argCnt and
 slots.

2007-04-04  Kyle Galloway  <kgallowa@redhat.com>

	* classpath/gnu/classpath/jdwp/util/VariableTable.java: Change longs
	to ints for argCnt and slots.
	(write): Replace writeLong with writeInt for the above.

From-SVN: r123511
---
 libjava/ChangeLog                             |   6 ++++++
 .../classpath/jdwp/util/VariableTable.java    |   8 ++++----
 .../classpath/jdwp/util/VariableTable.class   | Bin 1255 -> 1247 bytes
 .../gnu/classpath/jdwp/util/VariableTable.h   |   4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 09b7e07183e..3d0b9eca45a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-04  Kyle Galloway  <kgallowa@redhat.com>
+
+	* classpath/gnu/classpath/jdwp/util/VariableTable.java: Change longs
+	to ints for argCnt and slots.
+	(write): Replace writeLong with writeInt for the above. 
+
 2007-04-03  Andrew Haley  <aph@redhat.com>
 
 	* testsuite/libjava.lang/ProxyTest.java: New test.
diff --git a/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java b/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java
index 22d8c7dd621..f30c2158100 100644
--- a/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java
+++ b/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java
@@ -50,9 +50,9 @@ import java.io.IOException;
 public class VariableTable
 {
 
-  private final long argCnt;
+  private final int argCnt;
 
-  private final long slots;
+  private final int slots;
 
   private final long[] lineCI;
 
@@ -95,8 +95,8 @@ public class VariableTable
    */
   public void write(DataOutputStream os) throws IOException
   {
-    os.writeLong(argCnt);
-    os.writeLong(slots);
+    os.writeInt(argCnt);
+    os.writeInt(slots);
     for (int i = 0; i < slots; i++)
       {
         os.writeLong(lineCI[i]);
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class
index 7c653c3d6d36a547439a56452a1087a70d814727..0ba47cd0dc587a69d0981c983a7d3dad03d935e5 100644
GIT binary patch
delta 481
zcmX|+PfJ2k5XH}ZYWiOG2My7Blt`sMO-<9Rv@CF86oHmWJ2MF*G(xJKo4!E2RkU)|
zT1bnC+O_CQwCr0{b8q41&hK*OoSFHOKV{|P`}q~XJT`8WZI<hlvP^HYxF^V9KPg|7
z!?i{@x0Ai9RL`2VMqNP&5i`OJPW?@CrmW<QGFUFpYt3q|-efTPa{eN3Td*RI1cNNJ
ztw#Nri<?|bV%dx(JtBDxD@f@FQbzAdw_`7mV4-D#+9T}RL>CTC)vJa?OGX~UD8P<g
zxUh#Q6fuK+1W=+1QiTn(@Y0V0V8Q^HATyC9$O0J#K_irA6f{I+5@f|7b#kvlWG1%{
zesXF+i<%h?vyt4T2p&=hXb*7oFvqKtsv&)kB>#-7;T~d~R5kj9MNX4_a;u?#lSk0C
z#8jTp{(0|Etb}QLHQE6<q^l|z#gTqzbj9*G6}P(o#`kY6AdOX8&xQ=v#I1~oC$0Yi
DDIH8{

delta 471
zcmX|+yG{Z@6o&s<&}CN?qLC0-6->Oa%C3Oo6-A5%L}S85>5NgMYs^9j5o2Q`4?xzA
z2e8#d!B|*X`4X1azJNM27^gYk`Op04@*#an^85G8D}V?#8uB*DJQO#HK+;x|%#VZ#
z2F?yH4s@fWr*}3l50A@Lqh!j^5fL$CeUYJH6fpv+Rxzr_TP5>^z&@D??aG+Lyofl#
zXv6JwWsYj)T(x4DCr&J2(W(eZAM3L0#0nAw4(?BzRc23H_d?V23L6}BFHLP@K=s$3
z;8B&jwQq}G%gDlw90rkx9|Z)liwW!@j3UOUCEGD#oT}_;=)xojCy|oC$pMLuU{x3T
zVCU3Jsf&{nJ?Q2nQxd5=1eH3cfK&RJU>g0j+@{Q$6sFWicv{d{^wMZc++l$wK1KhN
z6(#zNS*8vDQ$W#LSYp~JryGGNb=Kmx`SWI7*`u*M&iPS+&Yb_F3RuM&-J>5VB>7PU
J>vR(Vsb5EdP|*MY

diff --git a/libjava/gnu/classpath/jdwp/util/VariableTable.h b/libjava/gnu/classpath/jdwp/util/VariableTable.h
index 05b0477fed7..893348e4fad 100644
--- a/libjava/gnu/classpath/jdwp/util/VariableTable.h
+++ b/libjava/gnu/classpath/jdwp/util/VariableTable.h
@@ -33,8 +33,8 @@ public:
   VariableTable(jint, jint, JArray< jlong > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< jint > *, JArray< jint > *);
   virtual void write(::java::io::DataOutputStream *);
 private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) argCnt;
-  jlong slots;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) argCnt;
+  jint slots;
   JArray< jlong > * lineCI;
   JArray< jint > * slot;
   JArray< jint > * lengths;