Page MenuHomeFreeBSD

D54759.diff
No OneTemporary

D54759.diff

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,16 @@
/* 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 {
+ assert(fdir != DIR_NONE);
+ do {
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:

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 1, 3:15 AM (16 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28259731
Default Alt Text
D54759.diff (1 KB)

Event Timeline