X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=a4206e0e220bde32803566e56dfc73b4b617a976;hp=a0b054af337aa2c83d284b17ab707f6c59a0e2f2;hb=3addebb2440550f9b34a39629bdb7c1ab1d05fc3;hpb=3d24ca2da53f03585db396e67252a7dcd9e67e6e

diff --git a/input.c b/input.c
index a0b054a..a4206e0 100644
--- a/input.c
+++ b/input.c
@@ -17,8 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -27,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
 #define BUFSIZE (16 * 1024)
 
@@ -74,7 +74,7 @@ static void load_input_file_module(void)
 			g_hash_table_destroy(mod_args);
 		if ((fd = open(opt_input_file, O_RDONLY)) == -1)
 			g_critical("Failed to load %s: %s.", opt_input_file,
-					strerror(errno));
+					g_strerror(errno));
 	} else {
 		if (strcmp(opt_input_file, "-")) {
 			/*
@@ -96,11 +96,11 @@ static void load_input_file_module(void)
 			} else {
 				if ((fd = open(opt_input_file, O_RDONLY)) == -1)
 					g_critical("Failed to load %s: %s.", opt_input_file,
-							strerror(errno));
+							g_strerror(errno));
 			}
 			if ((len = read(fd, buf->str, BUFSIZE)) < 1)
 				g_critical("Failed to read %s: %s.", opt_input_file,
-						strerror(errno));
+						g_strerror(errno));
 			buf->len = len;
 			sr_input_scan_buffer(buf, &in);
 		}
@@ -115,7 +115,7 @@ static void load_input_file_module(void)
 		g_string_truncate(buf, 0);
 		len = read(fd, buf->str, BUFSIZE);
 		if (len < 0)
-			g_critical("Read failed: %s", strerror(errno));
+			g_critical("Read failed: %s", g_strerror(errno));
 		if (len == 0)
 			/* End of file or stream. */
 			break;