aboutsummaryrefslogtreecommitdiffstats
path: root/src/gnutls.c
diff options
context:
space:
mode:
authorPaul Eggert2014-04-05 12:30:36 -0700
committerPaul Eggert2014-04-05 12:30:36 -0700
commitfaa521749378dbfd97f49a0e5c48f6da2ce1ddba (patch)
treed470dbfa3328aaeffe5cba065103e237238a13be /src/gnutls.c
parent1b058e42524353c9ff133ea330876ed2d39b6515 (diff)
downloademacs-faa521749378dbfd97f49a0e5c48f6da2ce1ddba.tar.gz
emacs-faa521749378dbfd97f49a0e5c48f6da2ce1ddba.zip
Prefer 'ARRAYELTS (x)' to 'sizeof x / sizeof *x'.
* alloc.c (memory_full): * charset.c (syms_of_charset): * doc.c (Fsnarf_documentation): * emacs.c (main): * font.c (BUILD_STYLE_TABLE): * keyboard.c (make_lispy_event): * profiler.c (setup_cpu_timer): * xgselect.c (xg_select): * xterm.c (record_event, STORE_KEYSYM_FOR_DEBUG): Use ARRAYELTS. * font.c (FONT_PROPERTY_TABLE_SIZE): Remove. Replace the only use with ARRAYELTS (font_property_table). * xfaces.c (DIM): Remove. All uses replaced by ARRAYELTS.
Diffstat (limited to 'src/gnutls.c')
-rw-r--r--src/gnutls.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index 03c29d03014..d9b417b46ed 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -56,7 +56,7 @@ static Lisp_Object QCgnutls_bootprop_verify_error;
56static Lisp_Object QCgnutls_bootprop_callbacks_verify; 56static Lisp_Object QCgnutls_bootprop_callbacks_verify;
57 57
58static void gnutls_log_function (int, const char *); 58static void gnutls_log_function (int, const char *);
59static void gnutls_log_function2 (int, const char*, const char*); 59static void gnutls_log_function2 (int, const char *, const char *);
60#ifdef HAVE_GNUTLS3 60#ifdef HAVE_GNUTLS3
61static void gnutls_audit_log_function (gnutls_session_t, const char *); 61static void gnutls_audit_log_function (gnutls_session_t, const char *);
62#endif 62#endif
@@ -267,7 +267,7 @@ init_gnutls_functions (void)
267#ifdef HAVE_GNUTLS3 267#ifdef HAVE_GNUTLS3
268/* Function to log a simple audit message. */ 268/* Function to log a simple audit message. */
269static void 269static void
270gnutls_audit_log_function (gnutls_session_t session, const char* string) 270gnutls_audit_log_function (gnutls_session_t session, const char *string)
271{ 271{
272 if (global_gnutls_log_level >= 1) 272 if (global_gnutls_log_level >= 1)
273 { 273 {
@@ -278,21 +278,21 @@ gnutls_audit_log_function (gnutls_session_t session, const char* string)
278 278
279/* Function to log a simple message. */ 279/* Function to log a simple message. */
280static void 280static void
281gnutls_log_function (int level, const char* string) 281gnutls_log_function (int level, const char *string)
282{ 282{
283 message ("gnutls.c: [%d] %s", level, string); 283 message ("gnutls.c: [%d] %s", level, string);
284} 284}
285 285
286/* Function to log a message and a string. */ 286/* Function to log a message and a string. */
287static void 287static void
288gnutls_log_function2 (int level, const char* string, const char* extra) 288gnutls_log_function2 (int level, const char *string, const char *extra)
289{ 289{
290 message ("gnutls.c: [%d] %s %s", level, string, extra); 290 message ("gnutls.c: [%d] %s %s", level, string, extra);
291} 291}
292 292
293/* Function to log a message and an integer. */ 293/* Function to log a message and an integer. */
294static void 294static void
295gnutls_log_function2i (int level, const char* string, int extra) 295gnutls_log_function2i (int level, const char *string, int extra)
296{ 296{
297 message ("gnutls.c: [%d] %s %d", level, string, extra); 297 message ("gnutls.c: [%d] %s %d", level, string, extra);
298} 298}
@@ -794,7 +794,7 @@ one trustfile (usually a CA bundle). */)
794 Lisp_Object global_init; 794 Lisp_Object global_init;
795 char const *priority_string_ptr = "NORMAL"; /* default priority string. */ 795 char const *priority_string_ptr = "NORMAL"; /* default priority string. */
796 unsigned int peer_verification; 796 unsigned int peer_verification;
797 char* c_hostname; 797 char *c_hostname;
798 798
799 /* Placeholders for the property list elements. */ 799 /* Placeholders for the property list elements. */
800 Lisp_Object priority_string; 800 Lisp_Object priority_string;