diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/agent.h | 4 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/agent/agent.h b/agent/agent.h index 2a2658de7..b374ee867 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -278,7 +278,7 @@ typedef int (*lookup_ttl_t)(const char *hexgrip); /*-- gpg-agent.c --*/ -void agent_exit (int rc) JNLIB_GCC_A_NR; /* Also implemented in other tools */ +void agent_exit (int rc) GPGRT_GCC_A_NR; /* Also implemented in other tools */ gpg_error_t agent_copy_startup_env (ctrl_t ctrl); const char *get_agent_socket_name (void); const char *get_agent_ssh_socket_name (void); @@ -294,7 +294,7 @@ gpg_error_t agent_write_status (ctrl_t ctrl, const char *keyword, ...) GNUPG_GCC_A_SENTINEL(0); gpg_error_t agent_print_status (ctrl_t ctrl, const char *keyword, const char *format, ...) - JNLIB_GCC_A_PRINTF(3,4); + GPGRT_GCC_A_PRINTF(3,4); void bump_key_eventcounter (void); void bump_card_eventcounter (void); void start_command_handler (ctrl_t, gnupg_fd_t, gnupg_fd_t); diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 0a8232f28..c27de89b6 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -681,7 +681,7 @@ main (int argc, char **argv ) /* Please note that we may running SUID(ROOT), so be very CAREFUL when adding any stuff between here and the call to INIT_SECMEM() somewhere after the option parsing */ - log_set_prefix (GPG_AGENT_NAME, JNLIB_LOG_WITH_PREFIX|JNLIB_LOG_WITH_PID); + log_set_prefix (GPG_AGENT_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_WITH_PID); /* Make sure that our subsystems are ready. */ i18n_init (); @@ -1071,9 +1071,9 @@ main (int argc, char **argv ) if (logfile) { log_set_file (logfile); - log_set_prefix (NULL, (JNLIB_LOG_WITH_PREFIX - |JNLIB_LOG_WITH_TIME - |JNLIB_LOG_WITH_PID)); + log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX + | GPGRT_LOG_WITH_TIME + | GPGRT_LOG_WITH_PID)); current_logfile = xstrdup (logfile); } @@ -1303,7 +1303,7 @@ main (int argc, char **argv ) } log_get_prefix (&oldflags); - log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED); + log_set_prefix (NULL, oldflags | GPGRT_LOG_RUN_DETACHED); opt.running_detached = 1; } @@ -1659,7 +1659,7 @@ create_server_socket (char *name, int primary, server is not yet operational; this would lead to a hang. */ if (primary && !check_for_running_agent (1)) { - log_set_prefix (NULL, JNLIB_LOG_WITH_PREFIX); + log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX); log_set_file (NULL); log_error (_("a gpg-agent is already running - " "not starting a new one\n")); |