From 68f69b899ff18bf6ced6249d48dd7f059a51255f Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Fri, 26 Oct 2012 00:06:08 -0700
Subject: [PATCH] Rename DexReader.skipBytes to moveRelative, and add setOffset

---
 dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexReader.java  | 3 ++-
 .../org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexReader.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexReader.java
index 6f0934ee..9c865ebd 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexReader.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexReader.java
@@ -46,6 +46,7 @@ public class DexReader {
 
     @Nonnull public DexBuffer getDexBuffer() { return dexBuf; }
     public int getOffset() { return offset; }
+    public void setOffset(int offset) { this.offset = offset; }
 
     public int getStringIdItemOffset(int stringIndex) { return dexBuf.getStringIdItemOffset(stringIndex); }
     public int getTypeIdItemOffset(int typeIndex) { return dexBuf.getTypeIdItemOffset(typeIndex); }
@@ -229,7 +230,7 @@ public class DexReader {
     }
 
     public void skipByte() { offset++; }
-    public void skipBytes(int i) { offset += i; }
+    public void moveRelative(int i) { offset += i; }
 
     public int readSmallUint(int offset) { return dexBuf.readSmallUint(offset); }
     public int readUshort(int offset) { return dexBuf.readUshort(offset); }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java
index b65b3df4..254ddebc 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java
@@ -131,7 +131,7 @@ public abstract class DexBackedEncodedValue {
                 case ValueType.METHOD:
                 case ValueType.ENUM:
                     int valueArg = b >>> 5;
-                    reader.skipBytes(valueArg+1);
+                    reader.moveRelative(valueArg+1);
                     break;
                 case ValueType.ARRAY:
                     DexBackedArrayEncodedValue.skipFrom(reader);