astyle files in preparation for release 4.6

Author: mdblack98

amplifiers/elecraft/kpa.c

@@ -67,7 +67,7 @@ int kpa_init(AMP *amp)
     }
 
     AMPSTATE(amp)->priv = (struct kpa_priv_data *)
-                      calloc(1, sizeof(struct kpa_priv_data));
+                          calloc(1, sizeof(struct kpa_priv_data));
 
     if (!AMPSTATE(amp)->priv)
     {

amplifiers/expert/expert.c

@@ -69,7 +69,7 @@ int expert_init(AMP *amp)
     }
 
     AMPSTATE(amp)->priv = (struct expert_priv_data *)
-                      calloc(1, sizeof(struct expert_priv_data));
+                          calloc(1, sizeof(struct expert_priv_data));
 
     if (!AMPSTATE(amp)->priv)
     {

amplifiers/gemini/gemini.c

@@ -46,7 +46,7 @@ int gemini_init(AMP *amp)
     }
 
     AMPSTATE(amp)->priv = (struct gemini_priv_data *)
-                      calloc(1, sizeof(struct gemini_priv_data));
+                          calloc(1, sizeof(struct gemini_priv_data));
 
     if (!AMPSTATE(amp)->priv)
     {

rigs/barrett/4100.c

@@ -110,7 +110,9 @@ static int barrett4100_open(RIG *rig)
     ENTERFUNC;
     retval = barrett_transaction2(rig, "M:REMOTE SENTER2,1", 3, &response);
 
-    rig_debug(RIG_DEBUG_ERR, "%s: back from REMOTE SENTER2: got %d\n", __func__, retval);
+    rig_debug(RIG_DEBUG_ERR, "%s: back from REMOTE SENTER2: got %d\n", __func__,
+              retval);
+
     if (response[0] != 's')
     {
         rig_debug(RIG_DEBUG_ERR, "%s: REMOTE SENTER2 error: got %s\n", __func__,
@@ -159,6 +161,7 @@ int barrett4100_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
             rig_debug(RIG_DEBUG_ERR, "%s: unable to parse s gRF\n", __func__);
         }
     }
+
     retval = barrett_transaction2(rig, "M:FF STF%.0f GTF", freq, &response);
 
     if (retval != RIG_OK)
@@ -196,10 +199,12 @@ int barrett4100_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
     else
     {
         int n = sscanf(response, "gRF%lf", freq);
+
         //int n = sscanf(response, "gRFA1,%*d,%lf,%*d", freq);
         if (n != 1)
         {
-            rig_debug(RIG_DEBUG_ERR, "%s(%d): unable to parse freq from '%s'\n", __func__, __LINE__, response);
+            rig_debug(RIG_DEBUG_ERR, "%s(%d): unable to parse freq from '%s'\n", __func__,
+                      __LINE__, response);
             return -RIG_EPROTO;
         }
     }

rigs/barrett/barrett.c

@@ -74,27 +74,33 @@ int barrett_transaction2(RIG *rig, char *cmd, int expected, char **result)
     SNPRINTF(cmd_buf, sizeof(cmd_buf), "%c%s%s", 0x0a, cmd, EOM);
     barrett_flush(rig);
     retval = write_block(rp, (unsigned char *) cmd_buf, strlen(cmd_buf));
+
     if (retval < 0)
     {
         rig_debug(RIG_DEBUG_ERR, "%s(%d): error in write_block\n", __func__, __LINE__);
         return retval;
     }
+
     retval = read_block(RIGPORT(rig), (unsigned char *) priv->ret_data, expected);
 
     if (retval < 0)
     {
         rig_debug(RIG_DEBUG_ERR, "%s(%d): error in read_block\n", __func__, __LINE__);
         return retval;
     }
-    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %d bytes read\n", __func__, __LINE__, retval);
-        if (priv->ret_data[0] == 0x13)   // we'll return from the 1st good char
-        {
-            *result = &(priv->ret_data[1]);
-        }
-        else     // some commands like IAL don't give XOFF but XON is there -- is this a bug?
-        {
-            *result = &(priv->ret_data[0]);
-        }
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): %d bytes read\n", __func__, __LINE__,
+              retval);
+
+    if (priv->ret_data[0] == 0x13)   // we'll return from the 1st good char
+    {
+        *result = &(priv->ret_data[1]);
+    }
+    else     // some commands like IAL don't give XOFF but XON is there -- is this a bug?
+    {
+        *result = &(priv->ret_data[0]);
+    }
+
     return retval;
 }
 
@@ -227,7 +233,7 @@ int barrett_init(RIG *rig)
               rig->caps->version);
     // cppcheck claims leak here but it's freed in cleanup
     STATE(rig)->priv = (struct barrett_priv_data *)calloc(1,
-                      sizeof(struct barrett_priv_data));
+                       sizeof(struct barrett_priv_data));
 
     if (!STATE(rig)->priv)
     {

rigs/codan/codan.c

@@ -138,7 +138,7 @@ int codan_init(RIG *rig)
               rig->caps->version);
     // cppcheck claims leak here but it's freed in cleanup
     STATE(rig)->priv = (struct codan_priv_data *)calloc(1,
-                      sizeof(struct codan_priv_data));
+                       sizeof(struct codan_priv_data));
 
     if (!STATE(rig)->priv)
     {