aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--scd/app.c2
-rw-r--r--scd/scdaemon.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/scd/app.c b/scd/app.c
index 29c9dadf4..b6f3a053e 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -139,7 +139,7 @@ check_application_conflict (const char *name, app_t app)
gpg_error_t
app_reset (app_t app, ctrl_t ctrl, int send_reset)
{
- gpg_error_t err;
+ gpg_error_t err = 0;
if (send_reset)
{
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index e4b0ef894..f7e9f83b5 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -1182,8 +1182,11 @@ start_connection_thread (void *arg)
void
scd_kick_the_loop (void)
{
+ int ret;
+
/* Kick the select loop. */
- write (notify_fd, "", 1);
+ ret = write (notify_fd, "", 1);
+ (void)ret;
}
/* Connection handler loop. Wait for connection requests and spawn a
@@ -1308,8 +1311,7 @@ handle_connections (int listen_fd)
{
char buf[256];
- read (pipe_fd[0], buf, sizeof buf);
- ret--;
+ ret = read (pipe_fd[0], buf, sizeof buf);
}
if (listen_fd != -1 && FD_ISSET (listen_fd, &read_fdset))