Reformat existing code. There should be no functional effects.

webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 601 matching lines @@
  *      - rtp_seq_number    : the RTP number of the packet.
  *      - arr_ts            : the arrival time of the packet (from NetEq)
  *                            in samples.
  *
  * Return value             :  0 - Ok
  *                            -1 - Error
  */
 
 int16_t WebRtcIsacfix_UpdateBwEstimate1(ISACFIX_MainStruct *ISAC_main_inst,
                                         const uint8_t* encoded,
-                                        int32_t          packet_size,
-                                        uint16_t         rtp_seq_number,
-                                        uint32_t         arr_ts)
+                                        int32_t packet_size,
+                                        uint16_t rtp_seq_number,
+                                        uint32_t arr_ts)
 {
   ISACFIX_SubStruct *ISAC_inst;
   Bitstr_dec streamdata;
   int16_t err;
   const int kRequiredEncodedLenBytes = 10;
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* Sanity check of packet length */
@@ skipping 49 matching lines @@
  *      - send_ts           : Send Time Stamp from RTP header
  *      - arr_ts            : the arrival time of the packet (from NetEq)
  *                            in samples.
  *
  * Return value             :  0 - Ok
  *                            -1 - Error
  */
 
 int16_t WebRtcIsacfix_UpdateBwEstimate(ISACFIX_MainStruct *ISAC_main_inst,
                                        const uint8_t* encoded,
-                                       int32_t          packet_size,
-                                       uint16_t         rtp_seq_number,
-                                       uint32_t         send_ts,
-                                       uint32_t         arr_ts)
+                                       int32_t packet_size,
+                                       uint16_t rtp_seq_number,
+                                       uint32_t send_ts,
+                                       uint32_t arr_ts)
 {
   ISACFIX_SubStruct *ISAC_inst;
   Bitstr_dec streamdata;
   int16_t err;
   const int kRequiredEncodedLenBytes = 10;
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* Sanity check of packet length */
@@ skipping 51 matching lines @@
  *      - len               : bytes in encoded vector
  *
  * Output:
  *      - decoded           : The decoded vector
  *
  * Return value             : >0 - number of samples in decoded vector
  *                            -1 - Error
  */
 
 
-int WebRtcIsacfix_Decode(ISACFIX_MainStruct *ISAC_main_inst,
+int WebRtcIsacfix_Decode(ISACFIX_MainStruct* ISAC_main_inst,
                          const uint8_t* encoded,
-                         int16_t          len,
-                         int16_t          *decoded,
-                         int16_t     *speechType)
+                         int16_t len,
+                         int16_t* decoded,
+                         int16_t* speechType)
 {
   ISACFIX_SubStruct *ISAC_inst;
   /* number of samples (480 or 960), output from decoder */
   /* that were actually used in the encoder/decoder (determined on the fly) */
   int16_t     number_of_samples;
   int declen = 0;
 
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
@@ skipping 189 matching lines @@
 
   /* Limit number of frames to two = 60 msec. Otherwise we exceed data vectors */
   if (noOfLostFrames > 2){
     noOfLostFrames = 2;
   }
 
   k = 0;
   declen = 0;
   while( noOfLostFrames > 0 )
   {
-    ok = WebRtcIsacfix_DecodePlcImpl( outframeWB, &ISAC_inst->ISACdec_obj, &no_of_samples );
-    if(ok)
-      return -1;
+    WebRtcIsacfix_DecodePlcImpl(outframeWB, &ISAC_inst->ISACdec_obj,
+                                &no_of_samples);
 
     WebRtcIsacfix_SplitAndFilter2(outframeWB, &(outframeNB[k*240]), dummy, &ISAC_inst->ISACdec_obj.decimatorstr_obj);
 
     declen += no_of_samples;
     noOfLostFrames--;
     k++;
   }
 
   declen>>=1;
 
@@ skipping 25 matching lines @@
  *
  * Return value             : >0 - number of samples in decoded PLC vector
  *                            -1 - Error
  */
 
 int16_t WebRtcIsacfix_DecodePlc(ISACFIX_MainStruct *ISAC_main_inst,
                                 int16_t          *decoded,
                                 int16_t noOfLostFrames)
 {
 
-  int16_t no_of_samples, declen, k, ok;
+  int16_t no_of_samples, declen, k;
   int16_t outframe16[MAX_FRAMESAMPLES];
 
   ISACFIX_SubStruct *ISAC_inst;
   /* typecast pointer to real structure */
   ISAC_inst = (ISACFIX_SubStruct *)ISAC_main_inst;
 
   /* Limit number of frames to two = 60 msec. Otherwise we exceed data vectors */
   if (noOfLostFrames > 2) {
     noOfLostFrames = 2;
   }
   k = 0;
   declen = 0;
   while( noOfLostFrames > 0 )
   {
-    ok = WebRtcIsacfix_DecodePlcImpl( &(outframe16[k*480]), &ISAC_inst->ISACdec_obj, &no_of_samples );
-    if(ok)
-      return -1;
+    WebRtcIsacfix_DecodePlcImpl(&(outframe16[k*480]), &ISAC_inst->ISACdec_obj,
+                                &no_of_samples);
     declen += no_of_samples;
     noOfLostFrames--;
     k++;
   }
 
   for (k=0;k<declen;k++) {
     decoded[k] = outframe16[k];
   }
 
   return declen;
@@ skipping 461 matching lines @@
  *
  * Output:
  *      - version  : Pointer to character string
  *
  */
 
 void WebRtcIsacfix_version(char *version)
 {
   strcpy(version, "3.6.0");
 }