aboutsummaryrefslogtreecommitdiffstats
path: root/scd/scdaemon.c
diff options
context:
space:
mode:
authorMoritz Schulte <[email protected]>2008-08-31 11:55:09 +0000
committerMoritz Schulte <[email protected]>2008-08-31 11:55:09 +0000
commit72110961f1a411863cd833877b960581fe38a428 (patch)
tree04999e19053c29bc5b05aedcba9562fce3e723cc /scd/scdaemon.c
parentAdd a warning nite to --throw-keyds. (diff)
downloadgnupg-72110961f1a411863cd833877b960581fe38a428.tar.gz
gnupg-72110961f1a411863cd833877b960581fe38a428.zip
2008-08-30 Moritz <[email protected]>
* scdaemon.c (main): Use estream_asprintf instead of asprintf. * command.c (update_reader_status_file): Likewise. (cmd_serialno): Use estream_asprintf instead of asprintf and xfree instead of free to release memory allocated through (estream_)asprintf. (cmd_learn): Likewise. (pin_cb): Likewise. * app-openpgp.c (get_public_key): Likewise.
Diffstat (limited to '')
-rw-r--r--scd/scdaemon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index a8a3bcff5..68119f592 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -702,8 +702,8 @@ main (int argc, char **argv )
close (fd);
/* create the info string: <name>:<pid>:<protocol_version> */
- if (asprintf (&infostr, "SCDAEMON_INFO=%s:%lu:1",
- socket_name, (ulong)pid ) < 0)
+ if (estream_asprintf (&infostr, "SCDAEMON_INFO=%s:%lu:1",
+ socket_name, (ulong) pid) < 0)
{
log_error ("out of core\n");
kill (pid, SIGTERM);
@@ -738,7 +738,7 @@ main (int argc, char **argv )
{
printf ( "%s; export SCDAEMON_INFO;\n", infostr);
}
- free (infostr);
+ xfree (infostr);
exit (0);
}
/* NOTREACHED */