summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrees <rees@openbsd.org>2001-06-28 21:37:28 +0000
committerrees <rees@openbsd.org>2001-06-28 21:37:28 +0000
commitb7e6264656e1c61664186a00c63a2d335280a876 (patch)
tree17e4ca9db0b2ea39dfcba78f72cc76441eda7f0f
parentfix return codes (diff)
downloadwireguard-openbsd-b7e6264656e1c61664186a00c63a2d335280a876.tar.xz
wireguard-openbsd-b7e6264656e1c61664186a00c63a2d335280a876.zip
remove printfs and add return codes
-rw-r--r--lib/libsectok/sectok.c29
1 files changed, 7 insertions, 22 deletions
diff --git a/lib/libsectok/sectok.c b/lib/libsectok/sectok.c
index bbc4c8656ca..f23e93c840c 100644
--- a/lib/libsectok/sectok.c
+++ b/lib/libsectok/sectok.c
@@ -1,4 +1,4 @@
-/* $Id: sectok.c,v 1.2 2001/06/27 22:33:36 rees Exp $ */
+/* $Id: sectok.c,v 1.3 2001/06/28 21:37:28 rees Exp $ */
/*
copyright 2000
@@ -58,29 +58,14 @@ sectok_fmt_fid(char *fname, int f0, int f1)
}
int
-sectok_selectfile(int fd, int cla, unsigned char *fid, int verbose)
+sectok_selectfile(int fd, int cla, unsigned char *fid, int *r1p, int *r2p)
{
- int n, r1, r2, code;
+ int n, r1, r2;
unsigned char obuf[256];
- char fname[6];
n = scrw(fd, cla, 0xa4, 0, 0, 2, fid, sizeof obuf, obuf, &r1, &r2);
- if (n < 0) {
- printf("selectfile: scwrite failed\n");
- return -2;
- }
- if (r1 == 0x90 || r1 == 0x61)
- code = 0;
- else if (r1 == 0x6a && r2 == 0x82)
- /* file not found */
- code = -1;
- else
- code = -2;
- if (verbose && n > 0)
- dump_reply(obuf, n, 0, 0);
- if (verbose || code == -2) {
- sectok_fmt_fid(fname, fid[0], fid[1]);
- printf("%s: %s\n", fname, get_r1r2s(r1, r2));
- }
- return code;
+ if (n < 0 || (r1 != 0x90 && r1 != 0x61))
+ return -1;
+
+ return 0;
}