Fix broken format strings for ProguardCoreException

Guardsquare · May 31, 2024 · df5f395 · df5f395
1 parent 89d546d
commit df5f395
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 25 deletions.
diff --git a/base/src/main/java/proguard/classfile/attribute/visitor/MaxStackSizeComputer.java b/base/src/main/java/proguard/classfile/attribute/visitor/MaxStackSizeComputer.java
@@ -113,13 +113,10 @@ public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAtt
           new ProguardCoreException(
               ErrorId.MAX_STACK_SIZE_COMPUTER_ERROR,
               ex,
-              "Unexpected error while computing stack sizes:{}  Class       = [{}]{}  Method      = [{}{}]{}  Exception   = [{}] ({})",
-              System.lineSeparator(),
+              "Unexpected error while computing stack sizes:%n  Class       = [%s]%n  Method      = [%s%s]%n  Exception   = [%s] (%s)",
               clazz.getName(),
-              System.lineSeparator(),
               method.getName(clazz),
               method.getDescriptor(clazz),
-              System.lineSeparator(),
               ex.getClass().getName(),
               ex.getMessage());
 

diff --git a/base/src/main/java/proguard/classfile/editor/CodeAttributeEditor.java b/base/src/main/java/proguard/classfile/editor/CodeAttributeEditor.java
@@ -561,13 +561,10 @@ public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAtt
       throw new ProguardCoreException(
           ErrorId.CODE_ATTRIBUTE_EDITOR_ERROR,
           ex,
-          "Unexpected error while editing code:{}  Class       = [{}]{}  Method      = [{}{}]{}  Exception   = [{}] ({})",
-          System.lineSeparator(),
+          "Unexpected error while editing code:%n  Class       = [%s]%n  Method      = [%s%s]%n  Exception   = [%s] (%s)",
           clazz.getName(),
-          System.lineSeparator(),
           method.getName(clazz),
           method.getDescriptor(clazz),
-          System.lineSeparator(),
           ex.getClass().getName(),
           ex.getMessage());
     }

diff --git a/base/src/main/java/proguard/evaluation/PartialEvaluator.java b/base/src/main/java/proguard/evaluation/PartialEvaluator.java
@@ -355,13 +355,10 @@ public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAtt
           new ProguardCoreException(
               ErrorId.PARTIAL_EVALUATOR_ERROR2,
               ex,
-              "Unexpected error while performing partial evaluation:{}  Class       = [{}]{}  Method      = [{}{}]{}  Exception   = [{}] ({})",
-              System.lineSeparator(),
+              "Unexpected error while performing partial evaluation:%n  Class       = [%s]%n  Method      = [%s%s]%n  Exception   = [%s] (%s)",
               clazz.getName(),
-              System.lineSeparator(),
               method.getName(clazz),
               method.getDescriptor(clazz),
-              System.lineSeparator(),
               ex.getClass().getName(),
               ex.getMessage());
 
@@ -811,15 +808,11 @@ logger, new CircularIntBuffer(prettyInstructionBuffered), code, clazz, method)
           throw new ProguardCoreException(
               ErrorId.PARTIAL_EVALUATOR_ERROR1,
               ex,
-              "Unexpected error while evaluating instruction:{}  Class       = [{}]{}  Method      = [{}{}]{}  Instruction = {}{}  Exception   = [{}] ({})",
-              System.lineSeparator(),
+              "Unexpected error while evaluating instruction:%n  Class       = [%s]%n  Method      = [%s%s]%n  Instruction = %s%n  Exception   = [%s] (%s)",
               clazz.getName(),
-              System.lineSeparator(),
               method.getName(clazz),
               method.getDescriptor(clazz),
-              System.lineSeparator(),
               instruction.toString(clazz, instructionOffset),
-              System.lineSeparator(),
               ex.getClass().getName(),
               ex.getMessage());
         }

diff --git a/base/src/main/java/proguard/preverify/CodePreverifier.java b/base/src/main/java/proguard/preverify/CodePreverifier.java
@@ -86,13 +86,10 @@ public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAtt
       throw new ProguardCoreException(
           ErrorId.CODE_PREVERIFIER_ERROR,
           ex,
-          "Unexpected error while preverifying:{}  Class       = [{}]{}  Method      = [{}{}]{}  Exception   = [{}] ({})",
-          System.lineSeparator(),
+          "Unexpected error while preverifying:%n  Class       = [%s]%n  Method      = [%s%s]%n  Exception   = [%s] (%s)",
           clazz.getName(),
-          System.lineSeparator(),
           method.getName(clazz),
           method.getDescriptor(clazz),
-          System.lineSeparator(),
           ex.getClass().getName(),
           ex.getMessage());
     }

diff --git a/base/src/main/java/proguard/preverify/CodeSubroutineInliner.java b/base/src/main/java/proguard/preverify/CodeSubroutineInliner.java
@@ -75,13 +75,10 @@ public void visitCodeAttribute(Clazz clazz, Method method, CodeAttribute codeAtt
           new ProguardCoreException(
               ErrorId.CODE_SUBROUTINE_INLINER_ERROR,
               ex,
-              "Unexpected error while inlining subroutines:{}  Class       = [{}]{}  Method      = [{}{}]{}  Exception   = [{}] ({})",
-              System.lineSeparator(),
+              "Unexpected error while inlining subroutines:%n  Class       = [%s]%n  Method      = [%s%s]%n  Exception   = [%s] (%s)",
               clazz.getName(),
-              System.lineSeparator(),
               method.getName(clazz),
               method.getDescriptor(clazz),
-              System.lineSeparator(),
               ex.getClass().getName(),
               ex.getMessage());