summaryrefslogtreecommitdiffstats
path: root/dexdump
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2010-06-08 16:37:12 -0700
committerCarl Shapiro <cshapiro@google.com>2010-06-08 17:04:11 -0700
commitde75089fb7216d19e9c22cce4dc62a49513477d3 (patch)
tree8c4035cc05218ddb7595e9a5c5997b53e58c2572 /dexdump
parent52ec072cc4dd215ff541a0b0842e91ea529a6e5d (diff)
downloadandroid_dalvik-de75089fb7216d19e9c22cce4dc62a49513477d3.tar.gz
android_dalvik-de75089fb7216d19e9c22cce4dc62a49513477d3.tar.bz2
android_dalvik-de75089fb7216d19e9c22cce4dc62a49513477d3.zip
Remove trailing whitespace.
Change-Id: I95534bb2b88eaf48f2329282041118cd034c812b
Diffstat (limited to 'dexdump')
-rw-r--r--dexdump/DexDump.c44
-rw-r--r--dexdump/OpCodeNames.h2
2 files changed, 23 insertions, 23 deletions
diff --git a/dexdump/DexDump.c b/dexdump/DexDump.c
index e5527ca80..318f84078 100644
--- a/dexdump/DexDump.c
+++ b/dexdump/DexDump.c
@@ -80,20 +80,20 @@ typedef struct FieldMethodInfo {
} FieldMethodInfo;
/*
- * Get 2 little-endian bytes.
- */
+ * Get 2 little-endian bytes.
+ */
static inline u2 get2LE(unsigned char const* pSrc)
{
return pSrc[0] | (pSrc[1] << 8);
-}
+}
/*
- * Get 4 little-endian bytes.
- */
+ * Get 4 little-endian bytes.
+ */
static inline u4 get4LE(unsigned char const* pSrc)
{
return pSrc[0] | (pSrc[1] << 8) | (pSrc[2] << 16) | (pSrc[3] << 24);
-}
+}
/*
* Converts a single-character primitive type into its human-readable
@@ -255,7 +255,7 @@ static char* createAccessFlagStr(u4 flags, AccessFor forWhat)
{
#define NUM_FLAGS 18
static const char* kAccessStrings[kAccessForMAX][NUM_FLAGS] = {
- {
+ {
/* class, inner class */
"PUBLIC", /* 0x0001 */
"PRIVATE", /* 0x0002 */
@@ -573,7 +573,7 @@ void dumpCatches(DexFile* pDexFile, const DexCode* pCode)
if (triesSize == 0) {
printf(" catches : (none)\n");
return;
- }
+ }
printf(" catches : %d\n", triesSize);
@@ -585,7 +585,7 @@ void dumpCatches(DexFile* pDexFile, const DexCode* pCode)
u4 start = pTry->startAddr;
u4 end = start + pTry->insnCount;
DexCatchIterator iterator;
-
+
printf(" 0x%04x - 0x%04x\n", start, end);
dexCatchIteratorInit(&iterator, pCode, pTry->handlerOff);
@@ -593,14 +593,14 @@ void dumpCatches(DexFile* pDexFile, const DexCode* pCode)
for (;;) {
DexCatchHandler* handler = dexCatchIteratorNext(&iterator);
const char* descriptor;
-
+
if (handler == NULL) {
break;
}
-
- descriptor = (handler->typeIdx == kDexNoIndex) ? "<any>" :
+
+ descriptor = (handler->typeIdx == kDexNoIndex) ? "<any>" :
dexStringByTypeIdx(pDexFile, handler->typeIdx);
-
+
printf(" %s -> 0x%04x\n", descriptor,
handler->address);
}
@@ -616,11 +616,11 @@ static int dumpPositionsCb(void *cnxt, u4 address, u4 lineNum)
/*
* Dump the positions list.
*/
-void dumpPositions(DexFile* pDexFile, const DexCode* pCode,
+void dumpPositions(DexFile* pDexFile, const DexCode* pCode,
const DexMethod *pDexMethod)
{
printf(" positions : \n");
- const DexMethodId *pMethodId
+ const DexMethodId *pMethodId
= dexGetMethodId(pDexFile, pDexMethod->methodIdx);
const char *classDescriptor
= dexStringByTypeIdx(pDexFile, pMethodId->classIdx);
@@ -634,7 +634,7 @@ static void dumpLocalsCb(void *cnxt, u2 reg, u4 startAddress,
const char *signature)
{
printf(" 0x%04x - 0x%04x reg=%d %s %s %s\n",
- startAddress, endAddress, reg, name, descriptor,
+ startAddress, endAddress, reg, name, descriptor,
signature);
}
@@ -646,9 +646,9 @@ void dumpLocals(DexFile* pDexFile, const DexCode* pCode,
{
printf(" locals : \n");
- const DexMethodId *pMethodId
+ const DexMethodId *pMethodId
= dexGetMethodId(pDexFile, pDexMethod->methodIdx);
- const char *classDescriptor
+ const char *classDescriptor
= dexStringByTypeIdx(pDexFile, pMethodId->classIdx);
dexDecodeDebugInfo(pDexFile, pCode, classDescriptor, pMethodId->protoIdx,
@@ -669,7 +669,7 @@ bool getMethodInfo(DexFile* pDexFile, u4 methodIdx, FieldMethodInfo* pMethInfo)
pMethInfo->name = dexStringById(pDexFile, pMethodId->nameIdx);
pMethInfo->signature = dexCopyDescriptorFromMethodId(pDexFile, pMethodId);
- pMethInfo->classDescriptor =
+ pMethInfo->classDescriptor =
dexStringByTypeIdx(pDexFile, pMethodId->classIdx);
return true;
}
@@ -1067,9 +1067,9 @@ void dumpBytecodes(DexFile* pDexFile, const DexMethod* pDexMethod)
insnWidth = 2 + get2LE((const u1*)(insns+1)) * 4;
} else if (instr == kArrayDataSignature) {
int width = get2LE((const u1*)(insns+1));
- int size = get2LE((const u1*)(insns+2)) |
+ int size = get2LE((const u1*)(insns+2)) |
(get2LE((const u1*)(insns+3))<<16);
- // The plus 1 is to round up for odd size and width
+ // The plus 1 is to round up for odd size and width
insnWidth = 4 + ((size * width) + 1) / 2;
} else {
opCode = instr & 0xff;
@@ -1355,7 +1355,7 @@ void dumpClass(DexFile* pDexFile, int idx, char** pLastPackage)
printf("Trouble reading class data (#%d)\n", idx);
goto bail;
}
-
+
classDescriptor = dexStringByTypeIdx(pDexFile, pClassDef->classIdx);
/*
diff --git a/dexdump/OpCodeNames.h b/dexdump/OpCodeNames.h
index 1aec0d174..3965c6de6 100644
--- a/dexdump/OpCodeNames.h
+++ b/dexdump/OpCodeNames.h
@@ -15,7 +15,7 @@
*/
/*
* Dalvik opcode names.
- */
+ */
#ifndef _DEXDUMP_OPCODENAMES
#define _DEXDUMP_OPCODENAMES