From: Uwe Hermann <redacted>
Date: Thu, 26 Mar 2015 20:39:28 +0000 (+0100)
Subject: Various #include file cosmetic fixes.
X-Git-Tag: sigrok-cli-0.6.0~35
X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=commitdiff_plain;h=662a1e27fa9573a35a6f9a6f699dee2be447826a;ds=sidebyside

Various #include file cosmetic fixes.

Generally include system headers before local headers, unless there's
a technical reason to use another order.
---

diff --git a/anykey.c b/anykey.c
index 8933586..eaa53f6 100644
--- a/anykey.c
+++ b/anykey.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <stdio.h>
 #ifdef _WIN32
 #include <windows.h>
@@ -27,6 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 #ifdef _WIN32
 static HANDLE stdin_handle;
diff --git a/decode.c b/decode.c
index 09b43f9..cadd5ea 100644
--- a/decode.c
+++ b/decode.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
+#include "config.h"
 
 #ifdef HAVE_SRD
 static GHashTable *pd_ann_visible = NULL;
diff --git a/device.c b/device.c
index 48646b5..17505e2 100644
--- a/device.c
+++ b/device.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
 #include <glib.h>
 #include <string.h>
+#include "sigrok-cli.h"
+#include "config.h"
 
 extern struct sr_context *sr_ctx;
 
diff --git a/input.c b/input.c
index a0b054a..79b6270 100644
--- a/input.c
+++ b/input.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -27,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
+#include "config.h"
 
 #define BUFSIZE (16 * 1024)
 
diff --git a/main.c b/main.c
index 4f2ff3c..a53566e 100644
--- a/main.c
+++ b/main.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <stdlib.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 struct sr_context *sr_ctx = NULL;
 #ifdef HAVE_SRD
diff --git a/options.c b/options.c
index 32787e5..6a97595 100644
--- a/options.c
+++ b/options.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <glib.h>
+#include "sigrok-cli.h"
 
 gboolean opt_version = FALSE;
 gint opt_loglevel = SR_LOG_WARN; /* Show errors+warnings by default. */
diff --git a/parsers.c b/parsers.c
index f0e2a7f..f7d03bc 100644
--- a/parsers.c
+++ b/parsers.c
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 extern struct sr_context *sr_ctx;
 
diff --git a/session.c b/session.c
index 983d484..30e0825 100644
--- a/session.c
+++ b/session.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "sigrok-cli.h"
 
 static uint64_t limit_samples = 0;
 static uint64_t limit_frames = 0;
diff --git a/show.c b/show.c
index f0dbbf4..88a272f 100644
--- a/show.c
+++ b/show.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
 #include <glib.h>
 #include <string.h>
+#include "sigrok-cli.h"
 
 static gint sort_inputs(gconstpointer a, gconstpointer b)
 {