diff options
author | Bdale Garbee <bdale@gag.com> | 2012-08-28 23:39:53 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2012-08-28 23:39:53 -0600 |
commit | 5ed88fb72c3e3ecf3333c700d838667db71cfbdc (patch) | |
tree | 3b371f563c0f7607f2fe53242673adb352b48514 /altosui/libaltos/libaltos.c | |
parent | adbe64c5a9402b7c5075a444a12629131b663877 (diff) | |
parent | 621d0930244f25165d2ac5da596dcc87e253b965 (diff) |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
debian/control
Diffstat (limited to 'altosui/libaltos/libaltos.c')
-rw-r--r-- | altosui/libaltos/libaltos.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/altosui/libaltos/libaltos.c b/altosui/libaltos/libaltos.c index 1cc27cbe..515432f9 100644 --- a/altosui/libaltos/libaltos.c +++ b/altosui/libaltos/libaltos.c @@ -221,7 +221,7 @@ altos_flush(struct altos_file *file) #endif if (ret < 0) { altos_set_last_posix_error(); - return -errno; + return -last_error.code; } if (ret) { memmove(file->out_data, file->out_data + ret, @@ -247,7 +247,7 @@ altos_putchar(struct altos_file *file, char c) ret = 0; if (file->out_used == USB_BUF_SIZE) ret = altos_flush(file); - return 0; + return ret; } #ifdef USE_POLL |