security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

agent: Clean up for scdaemon handling.

Browse Source 
* agent/call-daemon.c (struct daemon_local_s): Remove G field.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit 55559c8b66)
This commit is contained in:
NIIBE Yutaka 2024-06-11 15:36:17 +09:00 committed by Werner Koch
parent c868d23f61
commit 76066d71f4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/call-daemon.c
View File

@ -56,9 +56,6 @@ struct daemon_local_s
DAEMON_LOCAL_LIST (see below). */ DAEMON_LOCAL_LIST (see below). */
struct daemon_local_s *next_local; struct daemon_local_s *next_local;
/* Link back to the global structure. */
struct daemon_global_s *g;
assuan_context_t ctx; /* NULL or session context for the daemon assuan_context_t ctx; /* NULL or session context for the daemon
used with this connection. */ used with this connection. */
unsigned int in_use: 1; /* CTX is in use. */ unsigned int in_use: 1; /* CTX is in use. */
@ -310,7 +307,6 @@ daemon_start (enum daemon_type type, ctrl_t ctrl)
strerror (rc)); strerror (rc));
return err; return err;
} }
ctrl->d_local[type]->g = g;
ctrl->d_local[type]->next_local = g->local_list; ctrl->d_local[type]->next_local = g->local_list;
g->local_list = ctrl->d_local[type]; /* FIXME: CHECK the G thing */ g->local_list = ctrl->d_local[type]; /* FIXME: CHECK the G thing */
} }
@ -621,7 +617,7 @@ agent_reset_daemon (ctrl_t ctrl)
for (i = 0; i < DAEMON_MAX_TYPE; i++) for (i = 0; i < DAEMON_MAX_TYPE; i++)
if (ctrl->d_local[i]) if (ctrl->d_local[i])
{ {
struct daemon_global_s *g = ctrl->d_local[i]->g; struct daemon_global_s *g = &daemon_global[i];
if (ctrl->d_local[i]->ctx) if (ctrl->d_local[i]->ctx)
{ {