diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2017-05-24 15:19:28 +0200 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2017-05-24 15:19:28 +0200 |
| commit | 5e176c5794de5124b67d3ac4ea7afe2f210b6d84 (patch) | |
| tree | dceef253d0f954a7490909544fd1c0f1ccc60f35 /src | |
| parent | f8cfad88a860bf24c7745ec9695c4efa7ad948d5 (diff) | |
| parent | c976381d67e1c1ff16f155cbcc6c905245d0520f (diff) | |
| download | plan9port-5e176c5794de5124b67d3ac4ea7afe2f210b6d84.tar.gz plan9port-5e176c5794de5124b67d3ac4ea7afe2f210b6d84.tar.bz2 plan9port-5e176c5794de5124b67d3ac4ea7afe2f210b6d84.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/auth/factotum/secstore.c | 2 | ||||
| -rw-r--r-- | src/cmd/yacc.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cmd/auth/factotum/secstore.c b/src/cmd/auth/factotum/secstore.c index 2babf4d8..c17c3cf2 100644 --- a/src/cmd/auth/factotum/secstore.c +++ b/src/cmd/auth/factotum/secstore.c @@ -181,7 +181,7 @@ SC_read(SConn *conn, uchar *buf, int n) uchar count[2], digest[SHA1dlen]; int len, nr; - if(read(ss->fd, count, 2) != 2 || count[0]&0x80 == 0){ + if(read(ss->fd, count, 2) != 2 || (count[0]&0x80) == 0){ werrstr("!SC_read invalid count"); return -1; } diff --git a/src/cmd/yacc.c b/src/cmd/yacc.c index c080e012..32990f62 100644 --- a/src/cmd/yacc.c +++ b/src/cmd/yacc.c @@ -2130,11 +2130,12 @@ swt: c = Bgetrune(finput); if(c == '\n') lineno++; - } else + } else { if(c == match) goto lcopy; if(c == '\n') error("newline in string or char. const."); + } Bputrune(faction, c); } error("EOF in string or character constant"); |