diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-11-25 21:04:42 +0000 | 
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-11-25 21:04:42 +0000 | 
| commit | b9098066cd6284319bca922f13e59517f774a103 (patch) | |
| tree | f01fd6c9053cb01ed84c00cb42ee789adafceaf5 /source/components/executer/exmisc.c | |
| parent | 1e24cf365bc9c8df179b145c90d52852724e54ee (diff) | |
Notes
Diffstat (limited to 'source/components/executer/exmisc.c')
| -rw-r--r-- | source/components/executer/exmisc.c | 37 | 
1 files changed, 18 insertions, 19 deletions
| diff --git a/source/components/executer/exmisc.c b/source/components/executer/exmisc.c index 2a7b6202a663..ab01f6ea50dd 100644 --- a/source/components/executer/exmisc.c +++ b/source/components/executer/exmisc.c @@ -287,8 +287,8 @@ AcpiExDoConcatenate (      case ACPI_TYPE_STRING: -        Status = AcpiExConvertToString (Operand1, &LocalOperand1, -                    ACPI_IMPLICIT_CONVERT_HEX); +        Status = AcpiExConvertToString ( +            Operand1, &LocalOperand1, ACPI_IMPLICIT_CONVERT_HEX);          break;      case ACPI_TYPE_BUFFER: @@ -328,8 +328,8 @@ AcpiExDoConcatenate (          /* Result of two Integers is a Buffer */          /* Need enough buffer space for two integers */ -        ReturnDesc = AcpiUtCreateBufferObject ((ACPI_SIZE) -                            ACPI_MUL_2 (AcpiGbl_IntegerByteWidth)); +        ReturnDesc = AcpiUtCreateBufferObject ( +            (ACPI_SIZE) ACPI_MUL_2 (AcpiGbl_IntegerByteWidth));          if (!ReturnDesc)          {              Status = AE_NO_MEMORY; @@ -341,13 +341,12 @@ AcpiExDoConcatenate (          /* Copy the first integer, LSB first */          memcpy (NewBuf, &Operand0->Integer.Value, -                        AcpiGbl_IntegerByteWidth); +            AcpiGbl_IntegerByteWidth);          /* Copy the second integer (LSB first) after the first */          memcpy (NewBuf + AcpiGbl_IntegerByteWidth, -                        &LocalOperand1->Integer.Value, -                        AcpiGbl_IntegerByteWidth); +            &LocalOperand1->Integer.Value, AcpiGbl_IntegerByteWidth);          break;      case ACPI_TYPE_STRING: @@ -355,8 +354,8 @@ AcpiExDoConcatenate (          /* Result of two Strings is a String */          ReturnDesc = AcpiUtCreateStringObject ( -                        ((ACPI_SIZE) Operand0->String.Length + -                        LocalOperand1->String.Length)); +            ((ACPI_SIZE) Operand0->String.Length + +            LocalOperand1->String.Length));          if (!ReturnDesc)          {              Status = AE_NO_MEMORY; @@ -369,7 +368,7 @@ AcpiExDoConcatenate (          strcpy (NewBuf, Operand0->String.Pointer);          strcpy (NewBuf + Operand0->String.Length, -                        LocalOperand1->String.Pointer); +            LocalOperand1->String.Pointer);          break;      case ACPI_TYPE_BUFFER: @@ -377,8 +376,8 @@ AcpiExDoConcatenate (          /* Result of two Buffers is a Buffer */          ReturnDesc = AcpiUtCreateBufferObject ( -                        ((ACPI_SIZE) Operand0->Buffer.Length + -                        LocalOperand1->Buffer.Length)); +            ((ACPI_SIZE) Operand0->Buffer.Length + +            LocalOperand1->Buffer.Length));          if (!ReturnDesc)          {              Status = AE_NO_MEMORY; @@ -390,10 +389,10 @@ AcpiExDoConcatenate (          /* Concatenate the buffers */          memcpy (NewBuf, Operand0->Buffer.Pointer, -                        Operand0->Buffer.Length); +            Operand0->Buffer.Length);          memcpy (NewBuf + Operand0->Buffer.Length, -                        LocalOperand1->Buffer.Pointer, -                        LocalOperand1->Buffer.Length); +            LocalOperand1->Buffer.Pointer, +            LocalOperand1->Buffer.Length);          break;      default: @@ -635,8 +634,8 @@ AcpiExDoLogicalOp (      case ACPI_TYPE_STRING: -        Status = AcpiExConvertToString (Operand1, &LocalOperand1, -                    ACPI_IMPLICIT_CONVERT_HEX); +        Status = AcpiExConvertToString ( +            Operand1, &LocalOperand1, ACPI_IMPLICIT_CONVERT_HEX);          break;      case ACPI_TYPE_BUFFER: @@ -713,8 +712,8 @@ AcpiExDoLogicalOp (          /* Lexicographic compare: compare the data bytes */          Compare = memcmp (Operand0->Buffer.Pointer, -                    LocalOperand1->Buffer.Pointer, -                    (Length0 > Length1) ? Length1 : Length0); +            LocalOperand1->Buffer.Pointer, +            (Length0 > Length1) ? Length1 : Length0);          switch (Opcode)          { | 
