security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

common: Rename log and gcc attribute macros (jnlib merge).

Browse source 
* common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
* common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
--

JNLIB has no more meaning.  Thus we switch to a GPGRT_ prefix in
anticipation that some code may eventually be moved to libgpg-error.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-04-24 15:49:18 +02:00
parent 575230d91b
commit 26d7e0d7ac
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
21 changed files with 112 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dirmngr/dirmngr-client.c
View file

@ -183,7 +183,7 @@ main (int argc, char **argv )
early_system_init ();
set_strusage (my_strusage);
log_set_prefix ("dirmngr-client",
JNLIB_LOG_WITH_PREFIX);
GPGRT_LOG_WITH_PREFIX);
/* For W32 we need to initialize the socket subsystem. Becuase we
don't use Pth we need to do this explicit. */

12
dirmngr/dirmngr.c
View file

@ -1040,9 +1040,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);
}
@ -1211,7 +1211,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;
if (chdir("/"))
@ -1825,7 +1825,7 @@ housekeeping_thread (void *arg)
}
#if JNLIB_GCC_HAVE_PUSH_PRAGMA
#if GPGRT_GCC_HAVE_PUSH_PRAGMA
# pragma GCC push_options
# pragma GCC optimize ("no-strict-overflow")
#endif
@ -1845,7 +1845,7 @@ time_for_housekeeping_p (time_t curtime)
}
return 0;
}
#if JNLIB_GCC_HAVE_PUSH_PRAGMA
#if GPGRT_GCC_HAVE_PUSH_PRAGMA
# pragma GCC pop_options
#endif

4
dirmngr/dirmngr_ldap.c
View file

@ -245,7 +245,7 @@ ldap_wrapper_main (char **argv, estream_t outstream)
#ifdef USE_LDAPWRAPPER
set_strusage (my_strusage);
log_set_prefix ("dirmngr_ldap", JNLIB_LOG_WITH_PREFIX);
log_set_prefix ("dirmngr_ldap", GPGRT_LOG_WITH_PREFIX);
/* Setup I18N and common subsystems. */
i18n_init();
@ -297,7 +297,7 @@ ldap_wrapper_main (char **argv, estream_t outstream)
{
unsigned int oldflags;
log_get_prefix (&oldflags);
log_set_prefix (NULL, oldflags | JNLIB_LOG_WITH_PID);
log_set_prefix (NULL, oldflags | GPGRT_LOG_WITH_PID);
}
break;

2
dirmngr/ks-engine.h
View file

@ -26,7 +26,7 @@
/*-- ks-action.c --*/
gpg_error_t ks_print_help (ctrl_t ctrl, const char *text);
gpg_error_t ks_printf_help (ctrl_t ctrl, const char *format,
...) JNLIB_GCC_A_PRINTF(2,3);
...) GPGRT_GCC_A_PRINTF(2,3);
/*-- ks-engine-hkp.c --*/
gpg_error_t ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri);