* 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>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
+#include "sigrok-cli.h"
#define BUFSIZE (16 * 1024)
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, "-")) {
/*
} 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);
}
if (!in)
g_critical("Error: no input module found for this file.");
}
- sr_session_new(&session);
+ sr_session_new(sr_ctx, &session);
sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
got_sdi = FALSE;
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;
/* Input from stdin is never a session file. */
load_input_file_module();
} else {
- if ((ret = sr_session_load(opt_input_file, &session)) == SR_OK) {
+ if ((ret = sr_session_load(sr_ctx, opt_input_file,
+ &session)) == SR_OK) {
/* sigrok session file */
ret = sr_session_dev_list(session, &devices);
if (ret != SR_OK || !devices || !devices->data) {