4 files changed, 15 insertions, 15 deletions
diff --git a/src/compiler/Compiler.h b/src/compiler/Compiler.h
index 917e3fda03..d16735c621 100644
--- a/src/compiler/Compiler.h
+++ b/src/compiler/Compiler.h
@@ -119,11 +119,11 @@ bool oatFindInductionVariables(struct CompilationUnit* cUnit,
 /* Clear the visited flag for each BB */
 bool oatClearVisitedFlag(struct CompilationUnit* cUnit,
                                  struct BasicBlock* bb);
-char *oatGetDalvikDisassembly(const DecodedInstruction* insn,
+char* oatGetDalvikDisassembly(const DecodedInstruction* insn,
                                       const char* note);
-char *oatFullDisassembler(const struct CompilationUnit* cUnit,
+char* oatFullDisassembler(const struct CompilationUnit* cUnit,
                                   const struct MIR* mir);
-char *oatGetSSAString(struct CompilationUnit* cUnit,
+char* oatGetSSAString(struct CompilationUnit* cUnit,
                               struct SSARepresentation* ssaRep);
 void oatDataFlowAnalysisDispatcher(struct CompilationUnit* cUnit,
                 bool (*func)(struct CompilationUnit* , struct BasicBlock*),
diff --git a/src/compiler/Dataflow.cc b/src/compiler/Dataflow.cc
index 8b92c86970..67d900e200 100644
--- a/src/compiler/Dataflow.cc
+++ b/src/compiler/Dataflow.cc
@@ -1587,7 +1587,7 @@ int oatConvertSSARegToDalvik(const CompilationUnit* cUnit, int ssaReg)
  * and subscript pair. Each SSA register can be used to index the
  * ssaToDalvikMap list to get the subscript[31..16]/dalvik_reg[15..0] mapping.
  */
-char *oatGetDalvikDisassembly(const DecodedInstruction* insn,
+char* oatGetDalvikDisassembly(const DecodedInstruction* insn,
                                       const char* note)
 {
     char buffer[256];
@@ -1668,12 +1668,12 @@ char *oatGetDalvikDisassembly(const DecodedInstruction* insn,
         }
     }
     int length = strlen(buffer) + 1;
-    ret = (char *)oatNew(length, false);
+    ret = (char*)oatNew(length, false);
     memcpy(ret, buffer, length);
     return ret;
 }
 
-char *getSSAName(const CompilationUnit* cUnit, int ssaReg, char* name)
+char* getSSAName(const CompilationUnit* cUnit, int ssaReg, char* name)
 {
     int ssa2DalvikValue = oatConvertSSARegToDalvik(cUnit, ssaReg);
 
@@ -1685,7 +1685,7 @@ char *getSSAName(const CompilationUnit* cUnit, int ssaReg, char* name)
 /*
  * Dalvik instruction disassembler with optional SSA printing.
  */
-char *oatFullDisassembler(const CompilationUnit* cUnit,
+char* oatFullDisassembler(const CompilationUnit* cUnit,
                                   const MIR* mir)
 {
     char buffer[256];
@@ -1693,7 +1693,7 @@ char *oatFullDisassembler(const CompilationUnit* cUnit,
     const DecodedInstruction *insn = &mir->dalvikInsn;
     int opcode = insn->opcode;
     int dfAttributes = oatDataFlowAttributes[opcode];
-    char *ret;
+    char* ret;
     int length;
     OpcodeFlags flags;
 
@@ -1804,7 +1804,7 @@ char *oatFullDisassembler(const CompilationUnit* cUnit,
 
 done:
     length = strlen(buffer) + 1;
-    ret = (char *) oatNew(length, false);
+    ret = (char*) oatNew(length, false);
     memcpy(ret, buffer, length);
     return ret;
 }
@@ -1814,7 +1814,7 @@ done:
  * and subscript pair. Each SSA register can be used to index the
  * ssaToDalvikMap list to get the subscript[31..16]/dalvik_reg[15..0] mapping.
  */
-char *oatGetSSAString(CompilationUnit* cUnit, SSARepresentation* ssaRep)
+char* oatGetSSAString(CompilationUnit* cUnit, SSARepresentation* ssaRep)
 {
     char buffer[256];
     char* ret;
@@ -1846,7 +1846,7 @@ char *oatGetSSAString(CompilationUnit* cUnit, SSARepresentation* ssaRep)
     }
 
     int length = strlen(buffer) + 1;
-    ret = (char *)oatNew(length, false);
+    ret = (char*)oatNew(length, false);
     memcpy(ret, buffer, length);
     return ret;
 }
diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc
index 57d4616d84..89f63bec04 100644
--- a/src/compiler/Frontend.cc
+++ b/src/compiler/Frontend.cc
@@ -74,7 +74,7 @@ STATIC inline int parseInsn(const u2* codePtr, DecodedInstruction* decInsn,
 
     dexDecodeInstruction(codePtr, decInsn);
     if (printMe) {
-        char *decodedString = oatGetDalvikDisassembly(decInsn, NULL);
+        char* decodedString = oatGetDalvikDisassembly(decInsn, NULL);
         LOG(INFO) << codePtr << ": 0x" << std::hex << (int)opcode <<
         " " << decodedString;
     }
@@ -218,7 +218,7 @@ void oatDumpCFG(CompilationUnit* cUnit, const char* dirPrefix)
     std::string name = art::PrettyMethod(cUnit->method_idx, *cUnit->dex_file);
     char startOffset[80];
     sprintf(startOffset, "_%x", cUnit->entryBlock->fallThrough->startOffset);
-    char* fileName = (char *) oatNew(
+    char* fileName = (char*) oatNew(
                         strlen(dirPrefix) +
                         name.length() +
                         strlen(".dot") + 1, true);
diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc
index 7a719f799e..15fd1ba841 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -1822,7 +1822,7 @@ STATIC bool compileDalvikInstruction(CompilationUnit* cUnit, MIR* mir,
     return res;
 }
 
-STATIC const char *extendedMIROpNames[kMirOpLast - kMirOpFirst] = {
+STATIC const char* extendedMIROpNames[kMirOpLast - kMirOpFirst] = {
     "kMirOpPhi",
     "kMirOpNullNRangeUpCheck",
     "kMirOpNullNRangeDownCheck",
@@ -2031,7 +2031,7 @@ STATIC bool methodBlockCodeGen(CompilationUnit* cUnit, BasicBlock* bb)
 
         /* Don't generate the SSA annotation unless verbose mode is on */
         if (cUnit->printMe && mir->ssaRep) {
-            char *ssaString = oatGetSSAString(cUnit, mir->ssaRep);
+            char* ssaString = oatGetSSAString(cUnit, mir->ssaRep);
             newLIR1(cUnit, kArmPseudoSSARep, (int) ssaString);
         }