D54759.1775465529.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54759.1775465529.diff
View Options

	Index: usr.sbin/spi/spi.c
	===================================================================
	--- usr.sbin/spi/spi.c
	+++ usr.sbin/spi/spi.c
	@@ -30,6 +30,7 @@
	#include <sys/spigenio.h>
	#include <sys/sysctl.h>

	+#include <assert.h>
	#include <errno.h>
	#include <fcntl.h>
	#include <inttypes.h>
	@@ -364,30 +365,15 @@

	/* do data transfer */

	- if (stream) {
	- while (!err && !feof(stdin)) {
	- if (fdir == DIR_READ) {
	- err = perform_read(hdev, &opt);
	- }
	- else if (fdir == DIR_WRITE) {
	- err = perform_write(hdev, &opt);
	- }
	- else if (fdir == DIR_READWRITE) {
	- err = perform_readwrite(hdev, &opt);
	- }
	- }
	- }
	- else {
	- if (fdir == DIR_READ) {
	+ do {
	+ assert(fdir != DIR_NONE);
	+ if (fdir == DIR_READ)
	err = perform_read(hdev, &opt);
	- }
	- else if (fdir == DIR_WRITE) {
	+ else if (fdir == DIR_WRITE)
	err = perform_write(hdev, &opt);
	- }
	- else if (fdir == DIR_READWRITE) {
	+ else if (fdir == DIR_READWRITE)
	err = perform_readwrite(hdev, &opt);
	- }
	- }
	+ } while (stream && !err && !feof(stdin));

	the_end: